From e0116749710e21caa18df057363a47dcaadcf436 Mon Sep 17 00:00:00 2001 From: Fergus Henderson Date: Tue, 6 Apr 1999 18:27:27 +0000 Subject: [PATCH] A couple of fixes to trd's previous change: 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. --- scripts/ml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ml.in b/scripts/ml.in index 0d4dcc895..6b9dc7f9d 100644 --- a/scripts/ml.in +++ b/scripts/ml.in @@ -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="" ;;