mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-12 04:14:06 +00:00
Code Issues Projects Releases Wiki Activity

A couple of fixes to trd's previous change:

Browse Source 
Estimated hours taken: 0.25

scripts/ml.in:
	A couple of fixes to trd's previous change:
	- the libraries in TRACE_LIBS_SYSTEM should come before STDLIBS,
	  since the former might refer to the latter
	  (this is important with static linking and with DLLs,
	  since in both those situations you only get single-pass
	  linking unless you name the libraries multiple times on
	  the command line)
	- TRACE_LIBS_SYSTEM needs to be included even in the
	  `--mercury-libs none' case, otherwise compiler/Mmakefile
	  breaks.
This commit is contained in:
Fergus Henderson
1999-04-06 18:27:27 +00:00
parent 749e5a6f0d
commit e011674971
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ml.in
View File

@@ -441,7 +441,7 @@ LIBDIR_OPTS="$user_libdir_opts $merc_libdir_opts"
case $mercury_libs in
shared)
MERCURY_LIBS=${MERCURY_LIBS="$TRACE_LIBS -l$STD_LIB_NAME -l$RT_LIB_NAME $LIBGC"}
LIBS=${LIBS="$MERCURY_LIBS $STDLIBS $TRACE_LIBS_SYSTEM"}
LIBS=${LIBS="$MERCURY_LIBS $TRACE_LIBS_SYSTEM $STDLIBS"}
merc_shlib_dirs="$merc_shlib_dirs $LIBDIR/$GRADE/$FULLARCH"
merc_shlib_dirs="$merc_shlib_dirs $LIBDIR/$FULLARCH"
;;
@@ -450,10 +450,10 @@ case $mercury_libs in
$LIBDIR/$GRADE/$FULLARCH/lib$STD_LIB_NAME.a \
$LIBDIR/$GRADE/$FULLARCH/lib$RT_LIB_NAME.a \
$LIBGC_STATIC"}
LIBS=${LIBS="$MERCURY_LIBS $STDLIBS $TRACE_LIBS_SYSTEM"}
LIBS=${LIBS="$MERCURY_LIBS $TRACE_LIBS_SYSTEM $STDLIBS"}
merc_shlib_dirs=""
;;
none) LIBS="$STDLIBS"
none) LIBS="$TRACE_LIBS_SYSTEM $STDLIBS"
LIBDIR_OPTS="$user_libdir_opts"
merc_shlib_dirs=""
;;