2013-07-10 15:01:52 +02:00
|
|
|
--- coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
|
|
|
|
+++ coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
|
2010-04-10 11:19:21 +02:00
|
|
|
@@ -37,9 +37,9 @@
|
2007-01-30 21:23:04 +01:00
|
|
|
|
2001-12-19 10:30:28 +01:00
|
|
|
include $(CORE_DEPTH)/coreconf/UNIX.mk
|
|
|
|
|
|
|
|
-DEFAULT_COMPILER = gcc
|
|
|
|
-CC = gcc
|
|
|
|
-CCC = g++
|
|
|
|
+DEFAULT_COMPILER = $(CC)
|
2002-08-08 21:05:41 +02:00
|
|
|
+CC ?= gcc
|
2001-12-19 10:30:28 +01:00
|
|
|
+CCC = $(CXX)
|
|
|
|
RANLIB = ranlib
|
|
|
|
|
2010-04-10 11:19:21 +02:00
|
|
|
CPU_ARCH = $(OS_TEST)
|
2012-09-08 00:10:01 +02:00
|
|
|
@@ -52,6 +52,13 @@ endif
|
2010-04-10 11:19:21 +02:00
|
|
|
ifeq ($(CPU_ARCH),amd64)
|
2012-07-26 23:49:58 +02:00
|
|
|
CPU_ARCH = x86_64
|
2012-08-30 16:54:17 +02:00
|
|
|
endif
|
|
|
|
+ifneq (,$(filter powerpc%, $(CPU_ARCH)))
|
|
|
|
+CPU_ARCH = ppc
|
2010-04-10 11:19:21 +02:00
|
|
|
+endif
|
2012-09-08 00:10:01 +02:00
|
|
|
+
|
|
|
|
+ifneq (,$(filter %64, $(OS_TEST)))
|
2009-09-17 04:59:49 +02:00
|
|
|
+USE_64 = 1
|
2010-04-10 11:19:21 +02:00
|
|
|
+endif
|
2009-08-17 19:18:30 +02:00
|
|
|
|
2009-09-08 23:33:43 +02:00
|
|
|
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
|
2012-08-30 16:54:17 +02:00
|
|
|
|
2013-04-03 22:27:48 +02:00
|
|
|
@@ -70,15 +85,15 @@
|
2001-12-19 10:30:28 +01:00
|
|
|
|
2007-01-30 21:23:04 +01:00
|
|
|
ARCH = freebsd
|
2001-12-19 10:30:28 +01:00
|
|
|
|
2009-09-08 23:33:43 +02:00
|
|
|
-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
|
2013-02-20 00:53:07 +01:00
|
|
|
+ifndef MOZILLA_CLIENT
|
2001-12-19 10:30:28 +01:00
|
|
|
+DLL_SUFFIX = so.1
|
2013-02-20 00:53:07 +01:00
|
|
|
+endif
|
2004-03-19 07:35:22 +01:00
|
|
|
|
2007-01-30 21:23:04 +01:00
|
|
|
-ifeq ($(MOZ_OBJFORMAT),elf)
|
|
|
|
-DLL_SUFFIX = so
|
2004-04-18 03:29:33 +02:00
|
|
|
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
|
|
|
|
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
|
2007-01-30 21:23:04 +01:00
|
|
|
else
|
|
|
|
-DLL_SUFFIX = so.1.0
|
2004-03-19 07:35:22 +01:00
|
|
|
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
|
2007-01-30 21:23:04 +01:00
|
|
|
endif
|
2008-03-12 14:12:02 +01:00
|
|
|
-
|
2007-01-30 21:23:04 +01:00
|
|
|
-MKSHLIB = $(CC) $(DSO_LDOPTS)
|
2004-03-19 07:35:22 +01:00
|
|
|
ifdef MAPFILE
|
2007-01-30 21:23:04 +01:00
|
|
|
MKSHLIB += -Wl,--version-script,$(MAPFILE)
|
|
|
|
endif
|
2010-04-10 11:19:21 +02:00
|
|
|
@@ -87,4 +100,5 @@
|
2009-08-17 19:18:30 +02:00
|
|
|
|
2007-01-30 21:23:04 +01:00
|
|
|
G++INCLUDES = -I/usr/include/g++
|
2006-01-25 00:37:03 +01:00
|
|
|
|
2008-03-12 23:08:02 +01:00
|
|
|
-INCLUDES += -I/usr/X11R6/include
|
2006-01-25 00:37:03 +01:00
|
|
|
+USE_SYSTEM_ZLIB = 1
|
|
|
|
+ZLIB_LIBS = -lz
|