aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2017-06-12 22:14:00 +0200
committerTristan Gingold <tgingold@free.fr>2017-06-13 06:34:33 +0200
commit293cb1951037633a6b2846f8244a5170d1b240c4 (patch)
treefdda122d08a43f7aa1840939dfc7a005ad75fac6
parenta74aa51c8c4e4a891cb51f19f53aadc0ae080b38 (diff)
downloadghdl-293cb1951037633a6b2846f8244a5170d1b240c4.tar.gz
ghdl-293cb1951037633a6b2846f8244a5170d1b240c4.tar.bz2
ghdl-293cb1951037633a6b2846f8244a5170d1b240c4.zip
configure: use pwd -W on windows.
-rwxr-xr-xconfigure8
-rw-r--r--dist/windows/appveyor/configure.ps12
2 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index 30c6d65b3..36ae4e415 100755
--- a/configure
+++ b/configure
@@ -101,7 +101,13 @@ fi
# Set abs_srcdir (absolute srcdir)
case $srcdir in
/*) abs_srcdir=$srcdir;;
- *) abs_srcdir=`pwd`/$srcdir ;;
+ *)
+ # Use a Windows path on windows.
+ case "$OS" in
+ Windows_NT) abs_srcdir=`pwd -W`/$srcdir ;;
+ *) abs_srcdir=`pwd`/$srcdir ;;
+ esac
+ ;;
esac
# Sanity checks
diff --git a/dist/windows/appveyor/configure.ps1 b/dist/windows/appveyor/configure.ps1
index 7f85cfcba..f7f3561af 100644
--- a/dist/windows/appveyor/configure.ps1
+++ b/dist/windows/appveyor/configure.ps1
@@ -47,7 +47,7 @@ function Restore-NativeCommandStream
}
$GHDL_BUILD_DIR = "$($env:APPVEYOR_BUILD_FOLDER)\build\$($env:BUILD_MINGW)-$($env:BUILD_BACKEND)"
-$GHDL_PREFIX_DIR = "/c/Tools/GHDL/0.34-dev-$($env:BUILD_MINGW)-$($env:BUILD_BACKEND)"
+$GHDL_PREFIX_DIR = "c:/Tools/GHDL/0.34-dev-$($env:BUILD_MINGW)-$($env:BUILD_BACKEND)"
$env:GHDL_BUILD_DIR = $GHDL_BUILD_DIR
$env:GHDL_PREFIX_DIR = $GHDL_PREFIX_DIR