summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2011-02-19 09:08:26 +0000
committerOlli Savia <ops@iki.fi>2011-02-19 09:08:26 +0000
commit4ed73dab2bbb8ab2554191ef900c1328bf207cd4 (patch)
treebbd1bd1af3eb00e8a903b20aaa67b9264d26c481
parentcfa8217795918e17c0c2fd86657e179e108c4bbe (diff)
downloadATCD-4ed73dab2bbb8ab2554191ef900c1328bf207cd4.tar.gz
ChangeLogTag: Sat Feb 19 09:07:32 UTC 2011 Olli Savia <ops@iki.fi>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/include/makeinclude/platform_lynxos.GNU3
2 files changed, 6 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 897bc38d25e..222f2203ed9 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 19 09:07:32 UTC 2011 Olli Savia <ops@iki.fi>
+
+ * include/makeinclude/platform_lynxos.GNU:
+ Removed unneeded compile options
+
Fri Feb 18 22:20:42 UTC 2011 James H. Hill <hillj at cs dot iupui dot edu>
* ace/Functor_String.h:
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 03d1f29390f..9f20179c64e 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -70,7 +70,6 @@ endif
CC = gcc
CXX = g++
PIC = -fPIC
-CFLAGS += $(PIC)
CPPFLAGS += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR)
DCFLAGS += -g
DLD = $(CXX)
@@ -79,7 +78,7 @@ OCFLAGS += -O2
AR = ar
ARFLAGS = ruv
RANLIB = @true
-SOFLAGS += $(CPPFLAGS) -shared
+SOFLAGS += -shared
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
$(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
PRELIB = @true