Commit fccc859d authored by simonpj's avatar simonpj
Browse files

[project @ 2004-04-21 08:43:43 by simonpj]

Fix the OSTYPE test for Cygwin, and comment
parent a76480ab
...@@ -457,11 +457,23 @@ dnl Remove common automounter nonsense ...@@ -457,11 +457,23 @@ dnl Remove common automounter nonsense
dnl dnl
hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' ` hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' `
dnl Find 'hardtop_plat', the native format for 'hardtop' (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped). dnl Find 'hardtop_plat', the native format for 'hardtop'
dnl (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped).
dnl dnl
dnl Note OSTYPE: On Cygwin we need to use 'cygpath' to convert /cygdrive/c/foo to c:/foo
dnl but we must not do that if we aren't building using Cygwin (notably msys),
dnl because cygpath doesn't exist. It seems that 'bash' sets OSTYPE to 'cygwin'
dnl or 'msys' respectively, but cygwin's 'sh' does not. So we hackily assume
dnl that if the shell hasn't set it to 'msys' then we must be in Cygwin. Sigh.
dnl
dnl The Right Thing is probably to test $BuildPlatform instead, but we are sloppy
dnl about setting that correctly at the moment, so we just work around for now.
dnl
dnl The quotes round "$(OSTYPE)" are essential, for the Cygwin-sh case where OSTYPE
dnl is not set.
case $HostPlatform in case $HostPlatform in
i386-unknown-mingw32 | i386-unknown-cygwin32) i386-unknown-mingw32 | i386-unknown-cygwin32)
if test ${OSTYPE} != "msys" if test "${OSTYPE}" != "msys"
then then
# convert $hardtop to a path that mingw will understand too # convert $hardtop to a path that mingw will understand too
cyghardtop=${hardtop} cyghardtop=${hardtop}
...@@ -531,7 +543,7 @@ AC_ARG_WITH(gcc, ...@@ -531,7 +543,7 @@ AC_ARG_WITH(gcc,
[WhatGccIsCalled="$withval" [WhatGccIsCalled="$withval"
if test "x$HostPlatform" = "xi386-unknown-mingw32" if test "x$HostPlatform" = "xi386-unknown-mingw32"
then then
if test ${OSTYPE} != "msys" if test "${OSTYPE}" != "msys"
then then
# Canonicalise to <drive>:/path/to/gcc # Canonicalise to <drive>:/path/to/gcc
withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' ` withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' `
...@@ -793,7 +805,7 @@ case $Catalog in ...@@ -793,7 +805,7 @@ case $Catalog in
glafp*) glafp*)
case $HostOS_CPP in case $HostOS_CPP in
mingw32) mingw32)
if test ${OSTYPE} == "msys" if test "${OSTYPE}" == "msys"
then then
Catalog=$hardtop/$Catalog Catalog=$hardtop/$Catalog
else else
...@@ -1418,7 +1430,7 @@ dnl ** check for ld, and whether ld has -x option ...@@ -1418,7 +1430,7 @@ dnl ** check for ld, and whether ld has -x option
AC_PATH_PROG(LdCmdRaw, ld) AC_PATH_PROG(LdCmdRaw, ld)
case $HostOS_CPP in case $HostOS_CPP in
mingw32) mingw32)
if test ${OSTYPE} == "msys" if test "${OSTYPE}" == "msys"
then then
LdCmd=${LdCmdRaw} LdCmd=${LdCmdRaw}
else else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment