aboutsummaryrefslogtreecommitdiff
path: root/libstdc++
diff options
context:
space:
mode:
authorFred Fish <fnf@be.com>2000-01-13 01:37:38 +0000
committerJason Merrill <jason@gcc.gnu.org>2000-01-12 20:37:38 -0500
commit0753683c0ad9877dbd5c84a00d6d548c6d695d03 (patch)
tree33520dd890991ca6cdf9f3b501532d1511943176 /libstdc++
parentc135ea3910e9ddd7d52c7d2e9d277051c744c058 (diff)
downloadgcc-0753683c0ad9877dbd5c84a00d6d548c6d695d03.zip
gcc-0753683c0ad9877dbd5c84a00d6d548c6d695d03.tar.gz
gcc-0753683c0ad9877dbd5c84a00d6d548c6d695d03.tar.bz2
Makefile.in (SHOPT): New macro, flag to ld to create shared library.
* Makefile.in (SHOPT): New macro, flag to ld to create shared library. Defaults to "-shared". (SHLIB): Use new SHOPT rather than hardcoded "-shared". * configure.in: While configuring for *-*-beos*, if --enable-shared is given, add beos.ml to list of makefile frags. * config/beos.ml: New file. From-SVN: r31373
Diffstat (limited to 'libstdc++')
-rw-r--r--libstdc++/ChangeLog10
-rw-r--r--libstdc++/Makefile.in3
-rw-r--r--libstdc++/config/beos.ml4
-rw-r--r--libstdc++/configure.in1
4 files changed, 17 insertions, 1 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index cdd427e..8a882b7 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,13 @@
+2000-01-12 Fred Fish <fnf@be.com>
+
+ * Makefile.in (SHOPT): New macro, flag to ld to create
+ shared library. Defaults to "-shared".
+ (SHLIB): Use new SHOPT rather than hardcoded "-shared".
+ * configure.in: While configuring for *-*-beos*, if
+ --enable-shared is given, add beos.ml to list of makefile
+ frags.
+ * config/beos.ml: New file.
+
1999-12-15 Jason Merrill <jason@casey.cygnus.com>
* Makefile.in (MYCXXFLAGS): Include $(CXXFLAGS).
diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in
index 1b5c85a..ae8b5c3 100644
--- a/libstdc++/Makefile.in
+++ b/libstdc++/Makefile.in
@@ -39,6 +39,7 @@ SHLINK = libstdc++.so
MSHLINK = libstdc++.so.`echo $(VERSION) | sed 's/\([0-9]*[.][0-9]*\).*/\1/'`
SHFLAGS =
SHDEPS =
+SHOPT = -shared
STAMP = bigstmp
@@ -102,7 +103,7 @@ marlink:
@$(MAKE) $(MARLINK) "ARLINK=$(MARLINK)"
$(SHLIB): piclist
- $(CC) $(LIBCXXFLAGS) $(SHFLAGS) -shared -o $(SHLIB) `cat piclist` $(SHDEPS)
+ $(CC) $(LIBCXXFLAGS) $(SHFLAGS) $(SHOPT) -o $(SHLIB) `cat piclist` $(SHDEPS)
$(SHARLIB): $(SHLIB)
-rm -f t$(SHARLIB)
diff --git a/libstdc++/config/beos.ml b/libstdc++/config/beos.ml
new file mode 100644
index 0000000..f90b0b0
--- /dev/null
+++ b/libstdc++/config/beos.ml
@@ -0,0 +1,4 @@
+LIBS = $(ARLIB) $(ARLINK) $(SHLIB) mshlink $(SHLINK)
+SHFLAGS = -Wl,-soname,$(MSHLINK)
+DEPLIBS = ../$(SHLIB)
+SHOPT = -nostart
diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index e246360..546fdb8 100644
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -68,6 +68,7 @@ if [ "${shared}" = "yes" ]; then
esac
case "${target}" in
*-*-aix*) frags="${frags} aix.ml" ;;
+ *-*-beos*) frags="${frags} beos.ml" ;;
*-dec-osf*) frags="${frags} dec-osf.ml";;
*-*-freebsd2*) ;;
*-*-freebsd*) frags="${frags} freebsd.ml" ;;