[m-rev.] fix for Tru64 (dec-alpha-osf*) cc problem
Fergus Henderson
fjh at cs.mu.OZ.AU
Thu Dec 27 21:39:38 AEDT 2001
Estimated hours taken: 1
Branches: main
Fix a bug reported by Michael Cameron <Michael.Cameron at general.monash.edu.au>,
where on dec-osf-alpha* we were invoking `gcc' to link shared libraries
without checking whether it had been installed.
configure.in:
For dec-osf-alpha*, use `cc' to link shared libraries if `gcc'
is not in the PATH.
Workspace: /mnt/earth/home/earth/fjh/ws-earth4/mercury
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.286
diff -u -d -r1.286 configure.in
--- configure.in 2001/12/21 04:04:52 1.286
+++ configure.in 2001/12/27 10:32:56
@@ -2460,14 +2460,26 @@
;;
alpha*-dec-osf*)
AC_MSG_RESULT(yes)
- LINK_SHARED_OBJ="gcc -shared \
- -Wl,-O3,-update_registry,\$(SO_LOCATIONS_DIR)so_locations"
- LINK_SHARED_OBJ_SH="gcc -shared \
- -Wl,-O3,-update_registry,\${SO_LOCATIONS_DIR}so_locations"
- ERROR_UNDEFINED="-Wl,-error_unresolved"
- EXE_RPATH_OPT="-Wl,-rpath,"
+ if test "$GCC" != ""; then
+ # use gcc to link shared objects
+ LINK_SHARED_OBJ="gcc -shared \
+ -Wl,-O3,-update_registry,\$(SO_LOCATIONS_DIR)so_locations"
+ LINK_SHARED_OBJ_SH="gcc -shared \
+ -Wl,-O3,-update_registry,\${SO_LOCATIONS_DIR}so_locations"
+ ERROR_UNDEFINED="-Wl,-error_unresolved"
+ EXE_RPATH_OPT="-Wl,-rpath,"
+ SHLIB_RPATH_OPT="-Wl,-rpath,"
+ else
+ # use cc to link shared objects
+ LINK_SHARED_OBJ="cc -shared \
+ -update_registry,\$(SO_LOCATIONS_DIR)so_locations"
+ LINK_SHARED_OBJ_SH="cc -shared \
+ -update_registry,\${SO_LOCATIONS_DIR}so_locations"
+ ERROR_UNDEFINED="-error_unresolved"
+ EXE_RPATH_OPT="-rpath "
+ SHLIB_RPATH_OPT="-rpath "
+ fi
EXE_RPATH_SEP=":"
- SHLIB_RPATH_OPT="-Wl,-rpath,"
SHLIB_RPATH_SEP=":"
EXT_FOR_SHARED_LIB=so
# -fpic not needed on Alpha/OSF, since it is the default
--
Fergus Henderson <fjh at cs.mu.oz.au> | "I have always known that the pursuit
The University of Melbourne | of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh> | -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list