[m-rev.] diff: csc path names fix

[Fergus Henderson]

On 24-Oct-2002, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> On 24-Oct-2002, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> > Estimated hours taken: 3
> > Branches: main
> > 
> > Fix a bug where `mercury.dll' was not being found by the C# compiler.
> > when you configured with a non-MS C compiler.  This bug broke
> > tests/hard_coded/foreign_type in grade il.
> > 
> > configure.in:
> > bindist/bindist.build_vars.in:
> > 	Rename CYGPATH as FIX_PATH_FOR_CC.
> > 
> > scripts/Mmake.vars.in:
> > 	Rename CYGPATH as FIX_PATH_FOR_CC,
> > 	and add new variables FIX_PATH_FOR_CL and FIX_PATH_FOR_CSC.
> > 	The new variables are currently hard-wired as `cygpath -w',
> > 	since currently we only support the MS versions of CL and CSC.
> > 
> > 	Also, change the definition of MERC_DLL_DIR to use $(GRADE)
> > 	rather than hard-coding "ilc".
> > 
> > scripts/Mmake.rules:
> > 	Use the new variables, rather than $(CYGPATH).
> > 
> > 	Also, update various comments, and delete the unnecessary version
> > 	number from the MS_VC7_INCLUDES_DIR and MS_VC7_INCLUDES variable
> > 	names.
> 
> CYGPATH is also used in scripts/ml.in.

Oh, yes, I changed that, but forgot to include the change in the diff
that I posted and committed.  Here's the diff.

scripts/Mmake.ml.in:
 	Use @FIX_PATH_FOR_CC@ rather than @CYGPATH at .

Index: ml.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/ml.in,v
retrieving revision 1.99
diff -u -d -u -r1.99 ml.in
--- ml.in	11 Sep 2002 19:00:16 -0000	1.99
+++ ml.in	24 Oct 2002 07:32:26 -0000
@@ -37,6 +37,7 @@
 LINK_SHARED_OBJ=${MERCURY_LINK_SHARED_OBJ="@LINK_SHARED_OBJ_SH@"}
 SHLIB_RPATH_OPT=${MERCURY_SHLIB_RPATH_OPT="@SHLIB_RPATH_OPT@"}
 SHLIB_RPATH_SEP=${MERCURY_SHLIB_RPATH_SEP="@SHLIB_RPATH_SEP@"}
+FIX_PATH_FOR_LINKER=${MERCURY_PATH_FOR_LINKER="@FIX_PATH_FOR_CC@"}
 TMPDIR=${TMPDIR=/tmp}
 MATH_LIB=${MERCURY_MATH_LIB="@MATH_LIB@"}
 # Note: the setting of SHARED_LIBS needs to come after the setting of MATH_LIB,
@@ -228,7 +229,8 @@
 		;;
 	*)
 		LIBGC="-l$gc_grade"
-		LIBGC_STATIC=`@CYGPATH@ $LIBDIR/$FULLARCH/lib$gc_grade. at LIB_SUFFIX@`
+		LIBGC_STATIC=`$FIX_PATH_FOR_LINKER \
+			$LIBDIR/$FULLARCH/lib$gc_grade. at LIB_SUFFIX@`
 		;;
 esac
 
@@ -244,8 +246,10 @@
 		TRACE_LIBS_SYSTEM="$SOCKET_LIBRARY $NSL_LIBRARY $DL_LIBRARY \
 			$READLINE_LIBRARIES"
 		TRACE_STATIC_LIBS="\
-		  `@CYGPATH@ $LIBDIR/$GRADE/$FULLARCH/lib$TRACE_LIB_NAME. at LIB_SUFFIX@` \
-		  `@CYGPATH@ $LIBDIR/$GRADE/$FULLARCH/lib$BROWSER_LIB_NAME. at LIB_SUFFIX@`"
+		  `$FIX_PATH_FOR_LINKER \
+		    $LIBDIR/$GRADE/$FULLARCH/lib$TRACE_LIB_NAME. at LIB_SUFFIX@` \
+		  `$FIX_PATH_FOR_LINKER \
+		    $LIBDIR/$GRADE/$FULLARCH/lib$BROWSER_LIB_NAME. at LIB_SUFFIX@`"
 		;;
 	false)	TRACE_LIBS=
 		TRACE_LIBS_SYSTEM=
@@ -352,9 +356,11 @@
 		;;
 	static)
 		MERCURY_LIBS=${MERCURY_LIBS="$TRACE_STATIC_LIBS
-			`@CYGPATH@ $LIBDIR/$GRADE/$FULLARCH/lib$STD_LIB_NAME. at LIB_SUFFIX@` \
-			`@CYGPATH@ $LIBDIR/$GRADE/$FULLARCH/lib$RT_LIB_NAME. at LIB_SUFFIX@` \
-			$LIBGC_STATIC"}
+		`$FIX_PATH_FOR_LINKER \
+		  $LIBDIR/$GRADE/$FULLARCH/lib$STD_LIB_NAME. at LIB_SUFFIX@` \
+		`$FIX_PATH_FOR_LINKER \
+		  $LIBDIR/$GRADE/$FULLARCH/lib$RT_LIB_NAME. at LIB_SUFFIX@` \
+		$LIBGC_STATIC"}
 		LIBS=${LIBS="$MERCURY_LIBS $TRACE_LIBS_SYSTEM $STDLIBS"}
 		merc_shlib_dirs=""
 		;;
-- 
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
--------------------------------------------------------------------------