[m-dev.] diff: fix (I hope) problem with shared libs

Fergus Henderson fjh at cs.mu.OZ.AU
Mon Nov 29 00:06:15 AEDT 1999


Estimated hours taken: 0.5

configure.in:
	Fix some bugs in petdr's recent change to use
	multiple `-Wl' options rather than using a single
	`-Wl' option with comma separators (since lcc
	doesn't support the comma separators).

Workspace: /home/mercury0/fjh/mercury
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.195
diff -u -d -r1.195 configure.in
--- configure.in	1999/11/25 09:09:20	1.195
+++ configure.in	1999/11/28 12:37:27
@@ -1841,10 +1841,10 @@
 LINK_SHARED_OBJ="$CC -shared"
 LINK_SHARED_OBJ_SH="$CC -shared"
 SHARED_LIBS='`gcc -print-libgcc-file-name` -lm -lc'
-EXE_RPATH_OPT="-Wl-rpath,"
-EXE_RPATH_SEP=" -Wl-rpath,"
-SHLIB_RPATH_OPT="-Wl-rpath,"
-SHLIB_RPATH_SEP=" -Wl-rpath,"
+EXE_RPATH_OPT="-Wl-rpath -Wl"
+EXE_RPATH_SEP=" -Wl-rpath -Wl"
+SHLIB_RPATH_OPT="-Wl-rpath -Wl"
+SHLIB_RPATH_SEP=" -Wl-rpath -Wl"
 CFLAGS_FOR_PIC="-fpic -DPIC"
 EXT_FOR_PIC_OBJECTS=pic_o
 EXT_FOR_SHARED_LIB=a
@@ -1925,9 +1925,9 @@
 		LINK_SHARED_OBJ_SH="gcc -shared \
 		-Wl-O3 -Wl-update_registry -Wl\$(SO_LOCATIONS_DIR)so_locations"
 		ERROR_UNDEFINED="-Wl-error_unresolved"
-		EXE_RPATH_OPT="-Wl-rpath,"
+		EXE_RPATH_OPT="-Wl-rpath -Wl"
 		EXE_RPATH_SEP=":"
-		SHLIB_RPATH_OPT="-Wl-rpath,"
+		SHLIB_RPATH_OPT="-Wl-rpath -Wl"
 		SHLIB_RPATH_SEP=":"
 		EXT_FOR_SHARED_LIB=so
 		# -fpic not needed on Alpha/OSF, since it is the default
@@ -1942,7 +1942,7 @@
 			-update_registry \${SO_LOCATIONS_DIR}so_locations \
 			-quickstart_info -rdata_shared"
 		ERROR_UNDEFINED="-no_unresolved"
-		EXE_RPATH_OPT="-Wl-rpath,"
+		EXE_RPATH_OPT="-Wl-rpath -Wl"
 		EXE_RPATH_SEP=":"
 		SHLIB_RPATH_OPT="-rpath "
 		SHLIB_RPATH_SEP=":"

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------



More information about the developers mailing list