diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2005-06-02 22:34:49 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2005-06-02 22:34:49 +0000 |
| commit | c84492c2dbfa69d0f0dbc0a12d61374ead2c26fc (patch) | |
| tree | 7821a9b4df9a65d27467c469d5046e877d57a4e9 | |
| parent | 628214eb74549ee33b714107409076f348182333 (diff) | |
Fix the definitions of LLVMGCC and LLVMGXX to include the EXEEXT (the
.exe extension) on Cygwin. This fixes the last few remaining Cygwin
issues. Thanks to Aaron Gray for tracking this down.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22191 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 10 | ||||
| -rwxr-xr-x | configure | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 7a4832415c..dbb128f7c3 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -357,11 +357,13 @@ esac AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS) if test "$WITH_LLVMGCCDIR" = "default" ; then - AC_PATH_PROG(LLVMGCC, [llvm-gcc], []) - AC_PATH_PROG(LLVMGXX, [llvm-g++], []) + LLVMGCC="llvm-gcc${EXEEXT}" + LLVMGXX="llvm-g++${EXEEXT}" + AC_PATH_PROG(LLVMGCC, $LLVMGCC, []) + AC_PATH_PROG(LLVMGXX, $LLVMGXX, []) else - LLVMGCC=$WITH_LLVMGCCDIR/bin/llvm-gcc - LLVMGXX=$WITH_LLVMGCCDIR/bin/llvm-g++ + LLVMGCC="$WITH_LLVMGCCDIR/bin/llvm-gcc${EXEEXT}" + LLVMGXX="$WITH_LLVMGCCDIR/bin/llvm-g++${EXEEXT}" AC_SUBST(LLVMGCC,$LLVMGCC) AC_SUBST(LLVMGXX,$LLVMGXX) fi @@ -24625,8 +24625,10 @@ ETAGSFLAGS=$ETAGSFLAGS if test "$WITH_LLVMGCCDIR" = "default" ; then - # Extract the first word of "llvm-gcc", so it can be a program name with args. -set dummy llvm-gcc; ac_word=$2 + LLVMGCC="llvm-gcc${EXEEXT}" + LLVMGXX="llvm-g++${EXEEXT}" + # Extract the first word of "$LLVMGCC", so it can be a program name with args. +set dummy $LLVMGCC; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LLVMGCC+set}" = set; then @@ -24664,8 +24666,8 @@ else echo "${ECHO_T}no" >&6 fi - # Extract the first word of "llvm-g++", so it can be a program name with args. -set dummy llvm-g++; ac_word=$2 + # Extract the first word of "$LLVMGXX", so it can be a program name with args. +set dummy $LLVMGXX; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LLVMGXX+set}" = set; then @@ -24704,8 +24706,8 @@ echo "${ECHO_T}no" >&6 fi else - LLVMGCC=$WITH_LLVMGCCDIR/bin/llvm-gcc - LLVMGXX=$WITH_LLVMGCCDIR/bin/llvm-g++ + LLVMGCC="$WITH_LLVMGCCDIR/bin/llvm-gcc${EXEEXT}" + LLVMGXX="$WITH_LLVMGCCDIR/bin/llvm-g++${EXEEXT}" LLVMGCC=$LLVMGCC LLVMGXX=$LLVMGXX |