[m-dev.] diff: undo broken `-Wl,' changes

[Fergus Henderson]

Estimated hours taken: 0.25

configure.in:
	Back out petdr's recent petdr's recent change to use
	multiple `-Wl' options, and my attempted bug fix to
	that change, since neither of them work.

Workspace: /home/mercury0/fjh/mercury
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.196
diff -u -d -r1.196 configure.in
--- configure.in	1999/11/28 15:03:50	1.196
+++ configure.in	1999/11/30 02:00:45
@@ -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 -Wl"
-EXE_RPATH_SEP=" -Wl-rpath -Wl"
-SHLIB_RPATH_OPT="-Wl-rpath -Wl"
-SHLIB_RPATH_SEP=" -Wl-rpath -Wl"
+EXE_RPATH_OPT="-Wl,-rpath,"
+EXE_RPATH_SEP=" -Wl,-rpath,"
+SHLIB_RPATH_OPT="-Wl,-rpath,"
+SHLIB_RPATH_SEP=" -Wl,-rpath,"
 CFLAGS_FOR_PIC="-fpic -DPIC"
 EXT_FOR_PIC_OBJECTS=pic_o
 EXT_FOR_SHARED_LIB=a
@@ -1880,7 +1880,7 @@
 		SHARED_LIBS="-lm -lc"	# don't link in libgcc.a
 		LINK_SHARED_OBJ="$CC -G"
 		LINK_SHARED_OBJ_SH="$CC -G"
-		ERROR_UNDEFINED="-Wl-z -Wldefs"
+		ERROR_UNDEFINED="-Wl,-z,defs"
 		EXE_RPATH_OPT="-R"
 		EXE_RPATH_SEP=" -R"
 		SHLIB_RPATH_OPT="-R"
@@ -1921,13 +1921,13 @@
 	alpha-dec-osf*)
 		AC_MSG_RESULT(yes)
 		LINK_SHARED_OBJ="gcc -shared \
-		-Wl-O3 -Wl-update_registry -Wl\$(SO_LOCATIONS_DIR)so_locations"
+		-Wl,-O3,-update_registry,\$(SO_LOCATIONS_DIR)so_locations"
 		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 -Wl"
+		-Wl,-O3,-update_registry,\${SO_LOCATIONS_DIR}so_locations"
+		ERROR_UNDEFINED="-Wl,-error_unresolved"
+		EXE_RPATH_OPT="-Wl,-rpath,"
 		EXE_RPATH_SEP=":"
-		SHLIB_RPATH_OPT="-Wl-rpath -Wl"
+		SHLIB_RPATH_OPT="-Wl,-rpath,"
 		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 -Wl"
+		EXE_RPATH_OPT="-Wl,-rpath,"
 		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
--------------------------------------------------------------------------