summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-25 19:13:13 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-25 19:13:13 +0000
commit2c4b54ccab05c3054e79de89b012456d3d712f86 (patch)
tree5b685417f4c777da4cfdf4da4962f3a0afd0a72f /include
parente9e10921d49ff20be5cd4b7062ff8acd869228b6 (diff)
downloadATCD-2c4b54ccab05c3054e79de89b012456d3d712f86.tar.gz
ChangeLogTag:Fri Jul 25 17:32:58 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_g++_common.GNU8
-rw-r--r--include/makeinclude/platform_macosx.GNU2
2 files changed, 9 insertions, 1 deletions
diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU
index ba3f326c55e..84bc99b7b0e 100644
--- a/include/makeinclude/platform_g++_common.GNU
+++ b/include/makeinclude/platform_g++_common.GNU
@@ -43,6 +43,10 @@ ifeq ($(templates),explicit)
CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
endif
+ifeq (,$(with_ld))
+ with_ld = gnu
+endif
+
# The correct flags to pass to the linker for ELF dynamic shared library
# versioning
#
@@ -62,7 +66,9 @@ endif
# for shared libraries. (see http://gcc.gnu.org/faq.html#dso)
ifeq ($(shared_libs), 1)
ifneq ($(static_libs_only), 1)
- LDFLAGS += -Wl,-E
+ ifeq ($(with_ld), gnu)
+ LDFLAGS += -Wl,-E
+ endif # macosx
endif # static_libs_only
endif # shared_libs
diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU
index 08b121b31b7..cefe12db325 100644
--- a/include/makeinclude/platform_macosx.GNU
+++ b/include/makeinclude/platform_macosx.GNU
@@ -12,6 +12,8 @@ ifeq (,$(optimize))
optimize = 0
endif
+with_ld = macosx
+
CC = gcc
CXX = g++
CFLAGS += -Wall -Wpointer-arith -Wno-long-double -pipe -I/sw/include