summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-04-03 07:06:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-04-03 07:06:15 +0000
commit620087fea380601e643322116b2ff7231d336d03 (patch)
tree1aea59c49b1bf5c5ab14926bcf8df5fcf82f1585
parentbb89b4dab5c334a641f9fae542d67fc81ebbb115 (diff)
downloadATCD-620087fea380601e643322116b2ff7231d336d03.tar.gz
Thu Apr 3 07:05:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/bin/MakeProjectCreator/templates/gnu.mpd4
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c4a400f9965..7a7f7873c3e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 3 07:05:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/MakeProjectCreator/templates/gnu.mpd:
+ Generate link_groups also when staticflags are not set
+
Wed Apr 2 21:40:00 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index f5335a84ad9..beb0821e514 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -450,9 +450,11 @@ ifeq ($(shared_libs),1)
endif
endif
<%endif%>
-<%if(staticflags)%>
+<%if(staticflags || exename)%>
ifeq ($(static_libs),1)
+<%if(staticflags)%>
CPPFLAGS +=<%foreach(staticflags)%> -D<%staticflag%><%endfor%>
+<%endif%>
<%if(exename)%>
ifeq ($(link_groups), 1)
LDLIBS := -Wl,--start-group $(LDLIBS) -Wl,--end-group