summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-24 15:05:22 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-24 15:05:22 +0000
commitdf5f3b2616720c7ff2224e671c482eaa7049889d (patch)
treeb03f41c13c16186e650afb2cdfb88da78644b4c7
parent124aef53ccb529e0f32cd394a5844f083b7c117a (diff)
downloadATCD-df5f3b2616720c7ff2224e671c482eaa7049889d.tar.gz
ChangeLogTag:Thu Jul 24 15:01:59 UTC 2003 Don Hinton <dhinton@dresystems.com>
-rw-r--r--ChangeLog8
-rw-r--r--include/makeinclude/platform_g++_common.GNU4
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f7777237b4e..5001d263e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 24 15:01:59 UTC 2003 Don Hinton <dhinton@dresystems.com>
+
+ * include/makeinclude/platform_g++_common.GNU:
+ Added check for !static_libs_only before setting LDFLAGS +=
+ -Wl,-E, since the static_libs and shared_libs variables aren't
+ reset until later in wrapper_macros.GNU, e.g., users can either
+ set shared_libs=0 or static_libs_only=1 to turn off shared_libs.
+
Thu Jul 24 13:56:54 UTC 2003 Don Hinton <dhinton@dresystems.com>
* include/makeinclude/platform_g++_common.GNU:
diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU
index b590c1241f7..ba3f326c55e 100644
--- a/include/makeinclude/platform_g++_common.GNU
+++ b/include/makeinclude/platform_g++_common.GNU
@@ -61,6 +61,8 @@ endif
# Add all symbols to the dynamic symbol table. Needed to enable dynamic_cast
# for shared libraries. (see http://gcc.gnu.org/faq.html#dso)
ifeq ($(shared_libs), 1)
- LDFLAGS += -Wl,-E
+ ifneq ($(static_libs_only), 1)
+ LDFLAGS += -Wl,-E
+ endif # static_libs_only
endif # shared_libs