diff options
| author | Tanya Lattner <tonic@nondot.org> | 2008-10-07 22:34:35 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2008-10-07 22:34:35 +0000 |
| commit | 956d83f5aeb74055f23eba71f31aa4477fd4e33c (patch) | |
| tree | 2d5f7070213da80d8a1311c46574dcaa2a453185 | |
| parent | bd0bb5441071c243146d059619fb66b7c4ec9b43 (diff) | |
| download | llvm-956d83f5aeb74055f23eba71f31aa4477fd4e33c.tar.gz | |
Merge from mainline.
llvm-svn: 57269
| -rw-r--r-- | llvm/autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | llvm/configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index e96850bf7cbe..f6167b72b22e 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -872,7 +872,7 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`] AC_SUBST(LLVMGCC_VERSION,$llvmgccversion) AC_SUBST(LLVMGCC_MAJVERS,$llvmgccmajvers) - llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ -]*\).*/\1/'`] + llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`] AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs) AC_MSG_RESULT([ok]) fi diff --git a/llvm/configure b/llvm/configure index e6bd09439fd5..5fa3ad4080ab 100755 --- a/llvm/configure +++ b/llvm/configure @@ -34246,7 +34246,7 @@ echo $ECHO_N "checking llvm-gcc component support... $ECHO_C" >&6; } LLVMGCC_MAJVERS=$llvmgccmajvers - llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ -]*\).*/\1/'` + llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'` LLVMGCC_LANGS=$llvmgcclangs { echo "$as_me:$LINENO: result: ok" >&5 |