diff options
| author | Christian Cornelssen <ccorn@1tein.de> | 2018-05-17 19:57:58 +0200 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2018-05-19 15:09:15 +0200 |
| commit | 828c610f31bc8ad4c1a14fc238accbb15e5cf959 (patch) | |
| tree | 2a29a9299bc67cfae26c5319c4343666bfdbf124 /configure | |
| parent | 252a9169efef06b03061b58743be41e233a80ddb (diff) | |
| download | ghdl-828c610f31bc8ad4c1a14fc238accbb15e5cf959.tar.gz ghdl-828c610f31bc8ad4c1a14fc238accbb15e5cf959.tar.bz2 ghdl-828c610f31bc8ad4c1a14fc238accbb15e5cf959.zip | |
configure: Fall back to `pwd` if `pwd -W` does not work
This enables configure runs under Cygwin.
Also (re)move an unused curdir=`pwd`.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -124,9 +124,10 @@ case $srcdir in *) # Use a Windows path on windows. case "$OS" in - Windows_NT) abs_srcdir="`pwd -W`/$srcdir" ;; - *) abs_srcdir=`pwd`/$srcdir ;; + Windows_NT) curdir=`pwd -W 2>/dev/null || pwd` ;; + *) curdir=`pwd` ;; esac + abs_srcdir=$curdir/$srcdir ;; esac @@ -346,7 +347,6 @@ fi # Also update dist/windows/mcode/default_paths.ads if you change this # template. echo "Generate default_paths.ads" -curdir=`pwd` sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \ -e "s%@COMPILER_DEBUG@%ghdl1-debug$EXEEXT%" \ -e "s%@COMPILER_MCODE@%ghdl1-mcode$EXEEXT%" \ |