summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-04-20 10:40:11 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-04-20 10:40:11 +0000
commit44f881c0944ff284e2e6bdb50bd430aa8809d854 (patch)
tree916c52f75a4afdb41df9493a5461677eeae0b714
parentee27683bb674ffebc89aebd5499fe20eb634b6d9 (diff)
downloadATCD-44f881c0944ff284e2e6bdb50bd430aa8809d854.tar.gz
Mon Apr 20 11:40:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/wrapper_macros.GNU: Addes support for SOLINK.cc.override
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/include/makeinclude/wrapper_macros.GNU6
2 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 945e29e96d7..9b91e52c2bc 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 20 11:40:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/wrapper_macros.GNU:
+ Addes support for SOLINK.cc.override
+
Mon Apr 20 11:38:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_cegcc.GNU:
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 31bc814b4d7..25a5a60946c 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -913,4 +913,8 @@ else
LINK.cc = $(PURELINK) $(PRELINK) $(LD) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)
endif # LINK.cc.override
-SOLINK.cc = $(PRELINK) $(DLD) $(SOFLAGS)
+ifeq ($(SOLINK.cc),override)
+ SOLINK.cc = $(SOLINK.cc.override)
+else
+ SOLINK.cc = $(PRELINK) $(DLD) $(SOFLAGS)
+endif # SOLINK.cc.override