summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
diff options
context:
space:
mode:
authorstallions <stallions@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-09-01 19:22:38 +0000
committerstallions <stallions@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-09-01 19:22:38 +0000
commit55402398d3d2abae2d263e43a60f3192611889ea (patch)
tree80f3f9add03f3326334193b3f7bba9fa0b574a4a /ACE/include/makeinclude/platform_sunos5_sunc++.GNU
parent472563fec0cf2d356d998ef9876ca41f380fce29 (diff)
downloadATCD-55402398d3d2abae2d263e43a60f3192611889ea.tar.gz
Tue Sep 1 18:46:31 UTC 2009 Steven Stallion <stallions@ociweb.com>
Diffstat (limited to 'ACE/include/makeinclude/platform_sunos5_sunc++.GNU')
-rw-r--r--ACE/include/makeinclude/platform_sunos5_sunc++.GNU18
1 files changed, 9 insertions, 9 deletions
diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
index 42e383bbb23..2eaebddeae9 100644
--- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -222,15 +222,6 @@ ifeq ($(distrib),0)
LDFLAGS += -R $(ACE_ROOT)/lib -R./
endif
-### CC 5.10 enables annotation support by default; allow user to override
-### new behavior. This also provides a work around for 64-bit linker crashes,
-### see: http://defect.opensolaris.org/bz/show_bug.cgi?id=9720
-ifeq (C++ 5.10,$(findstring C++ 5.10,$(CC_VERSION)))
- ifeq ($(no_annotations),1)
- LDFLAGS += -xannotate=no
- endif
-endif
-
# Get common Solaris settings
include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU
@@ -243,6 +234,15 @@ ifeq ($(stlport),0)
LIBS += -lCrun -lCstd
endif
+### CC 5.10 enables annotation support by default; allow user to override
+### new behavior. This also provides a work around for 64-bit linker crashes,
+### see: http://defect.opensolaris.org/bz/show_bug.cgi?id=9720
+ifeq (C++ 5.10,$(findstring C++ 5.10,$(CC_VERSION)))
+ ifeq ($(no_annotations),1)
+ LDFLAGS += -xannotate=no
+ endif
+endif
+
LDFLAGS += -xildoff
OCFLAGS += -xO4