aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author1138-4EB <1138-4EB@users.noreply.github.com>2019-09-02 18:27:45 +0200
committertgingold <tgingold@users.noreply.github.com>2019-09-02 18:27:45 +0200
commitfcdd43d1bc6834408b3f16a654bc0cddf4533c5e (patch)
tree4ee4eb5bff4d7e7cbf968c526f23663c6665888f
parentbaeaef814b6d935906d1687c287cc66c74bf0a5c (diff)
downloadghdl-fcdd43d1bc6834408b3f16a654bc0cddf4533c5e.tar.gz
ghdl-fcdd43d1bc6834408b3f16a654bc0cddf4533c5e.tar.bz2
ghdl-fcdd43d1bc6834408b3f16a654bc0cddf4533c5e.zip
revert "configure: fix setting abs_srcdir on MSYS2/MINGW" (#911) (#914)
This reverts commit 7b02418ec508af9e340cad5e93ab06e8f1fb84c8.
-rwxr-xr-xconfigure11
1 files changed, 5 insertions, 6 deletions
diff --git a/configure b/configure
index 23b40b1f8..a67d6bb54 100755
--- a/configure
+++ b/configure
@@ -146,12 +146,11 @@ fi
case $srcdir in
/*) abs_srcdir=$srcdir;;
*)
- # Use a Windows path when not on MSYS2/MINGW.
- if [ -z "$MSYSTEM" ]; then
- curdir=`pwd -W 2>/dev/null || pwd`
- else
- curdir=`pwd`
- fi
+ # Use a Windows path on windows.
+ case "$OS" in
+ Windows_NT) curdir=`pwd -W 2>/dev/null || pwd` ;;
+ *) curdir=`pwd` ;;
+ esac
abs_srcdir=$curdir/$srcdir
;;
esac