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

Fix "cygpath: command not found" errors with `mmake --use-mmc-make'.

Browse Source 
Estimated hours taken: 0.25
Branches: main

Fix "cygpath: command not found" errors with `mmake --use-mmc-make'.

configure.in:
bindist/bindist.configure.in:
scripts/Mmake.vars.in:
	Check that `cygpath' exists, rather than hard-coding
	it in Mmake.vars.in.
This commit is contained in:
Simon Taylor
2002-11-04 01:49:10 +00:00
parent d896c44bf4
commit 8687a17aea
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bindist/bindist.configure.in
View File

@@ -84,6 +84,7 @@ AC_SUBST(LIB_LIBPATH)
AC_SUBST(LINK_LIB) AC_SUBST(LINK_LIB)
AC_SUBST(LINK_OPT_SEP) AC_SUBST(LINK_OPT_SEP)
AC_SUBST(FIX_PATH_FOR_CC) AC_SUBST(FIX_PATH_FOR_CC)
AC_SUBST(CYGPATH)
AC_SUBST(MATH_LIB) AC_SUBST(MATH_LIB)
AC_SUBST(SHARED_LIBS_SH) AC_SUBST(SHARED_LIBS_SH)
AC_SUBST(CGIDIR) AC_SUBST(CGIDIR)

8
configure.in
View File

@@ -392,6 +392,8 @@ AC_EGREP_CPP(yes,
] AC_MSG_RESULT(yes), [ac_microsoft=no ] AC_MSG_RESULT(yes), [ac_microsoft=no
] AC_MSG_RESULT(no)) ] AC_MSG_RESULT(no))
AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo)
if test "$ac_microsoft" = "yes" ; then if test "$ac_microsoft" = "yes" ; then
# Use MS-style file names and command-line options # Use MS-style file names and command-line options
OBJ_SUFFIX="obj" OBJ_SUFFIX="obj"
@@ -408,7 +410,10 @@ if test "$ac_microsoft" = "yes" ; then
USING_MICROSOFT_CL_COMPILER="yes" USING_MICROSOFT_CL_COMPILER="yes"
FIX_PATH_FOR_CC="cygpath -w" case "$CYGPATH" in "echo")
AC_MSG_WARN("cygpath required with Microsoft Visual C++") ;;
esac
FIX_PATH_FOR_CC="$CYGPATH"
# MS doesn't use a ranlib. # MS doesn't use a ranlib.
RANLIB="echo" RANLIB="echo"
@@ -459,6 +464,7 @@ AC_SUBST(LIB_LIBPATH)
AC_SUBST(LINK_LIB) AC_SUBST(LINK_LIB)
AC_SUBST(LINK_OPT_SEP) AC_SUBST(LINK_OPT_SEP)
AC_SUBST(FIX_PATH_FOR_CC) AC_SUBST(FIX_PATH_FOR_CC)
AC_SUBST(CYGPATH)
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
# Microsoft.NET configuration # Microsoft.NET configuration

4
scripts/Mmake.vars.in
View File

@@ -212,7 +212,7 @@ LIB_CFLAGS = $(patsubst %,-I %,$(EXTRA_C_INCL_DIRS))
# MS_CL is the command line version of Microsoft Visual C++, which we # MS_CL is the command line version of Microsoft Visual C++, which we
# use to compile Managed C++ code in the .NET backend. # use to compile Managed C++ code in the .NET backend.
FIX_PATH_FOR_CL = cygpath -w FIX_PATH_FOR_CL = @CYGPATH@
MS_CL = @MS_CL@ MS_CL = @MS_CL@
MS_VISUALCPP_DIR = @MS_VISUALCPP_DIR@ MS_VISUALCPP_DIR = @MS_VISUALCPP_DIR@
ALL_MS_CLFLAGS = $(MS_CLFLAGS) $(EXTRA_MS_CLFLAGS) $(TARGET_MS_CLFLAGS) \ ALL_MS_CLFLAGS = $(MS_CLFLAGS) $(EXTRA_MS_CLFLAGS) $(TARGET_MS_CLFLAGS) \
@@ -259,7 +259,7 @@ MS_AL = al
# which have a different command-line interface. # which have a different command-line interface.
# (What about Rotor?) # (What about Rotor?)
FIX_PATH_FOR_CSC = cygpath -w FIX_PATH_FOR_CSC = @CYGPATH@
MS_CSC = csc MS_CSC = csc
ALL_MS_CSCFLAGS = $(MS_CSCFLAGS) $(EXTRA_MS_CSCFLAGS) $(TARGET_MS_CSCFLAGS) \ ALL_MS_CSCFLAGS = $(MS_CSCFLAGS) $(EXTRA_MS_CSCFLAGS) $(TARGET_MS_CSCFLAGS) \
$(LIB_MS_CSCFLAGS) $(LIB_MS_CSCFLAGS)