Skip to content

Commit f6f6d88

Browse files
committed
Add an exposed variable for which c++ compiler we're using for our
build. Patch by Chris Bieneman! llvm-svn: 245255
1 parent ab48abe commit f6f6d88

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

llvm/autoconf/configure.ac

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __clang__
133133
llvm_cv_cxx_compiler=gcc, [])])
134134
AC_LANG_POP([C++])
135135
AC_MSG_RESULT([${llvm_cv_cxx_compiler}])
136+
AC_SUBST(CXX_COMPILER,$llvm_cv_cxx_compiler)
136137

137138
dnl Configure all of the projects present in our source tree. While we could
138139
dnl just AC_CONFIG_SUBDIRS on the set of directories in projects that have a

llvm/configure

+7-3
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ CXX
655655
CXXFLAGS
656656
ac_ct_CXX
657657
CPP
658+
CXX_COMPILER
658659
subdirs
659660
ENABLE_POLLY
660661
LLVM_HAS_POLLY
@@ -3752,6 +3753,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
37523753

37533754
{ echo "$as_me:$LINENO: result: ${llvm_cv_cxx_compiler}" >&5
37543755
echo "${ECHO_T}${llvm_cv_cxx_compiler}" >&6; }
3756+
CXX_COMPILER=$llvm_cv_cxx_compiler
3757+
37553758

37563759

37573760

@@ -18498,6 +18501,7 @@ CXX!$CXX$ac_delim
1849818501
CXXFLAGS!$CXXFLAGS$ac_delim
1849918502
ac_ct_CXX!$ac_ct_CXX$ac_delim
1850018503
CPP!$CPP$ac_delim
18504+
CXX_COMPILER!$CXX_COMPILER$ac_delim
1850118505
subdirs!$subdirs$ac_delim
1850218506
ENABLE_POLLY!$ENABLE_POLLY$ac_delim
1850318507
LLVM_HAS_POLLY!$LLVM_HAS_POLLY$ac_delim
@@ -18541,7 +18545,6 @@ ENABLE_WERROR!$ENABLE_WERROR$ac_delim
1854118545
ENABLE_EXPENSIVE_CHECKS!$ENABLE_EXPENSIVE_CHECKS$ac_delim
1854218546
EXPENSIVE_CHECKS!$EXPENSIVE_CHECKS$ac_delim
1854318547
ENABLE_ABI_BREAKING_CHECKS!$ENABLE_ABI_BREAKING_CHECKS$ac_delim
18544-
DEBUG_RUNTIME!$DEBUG_RUNTIME$ac_delim
1854518548
_ACEOF
1854618549

1854718550
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -18583,6 +18586,7 @@ _ACEOF
1858318586
ac_delim='%!_!# '
1858418587
for ac_last_try in false false false false false :; do
1858518588
cat >conf$$subs.sed <<_ACEOF
18589+
DEBUG_RUNTIME!$DEBUG_RUNTIME$ac_delim
1858618590
DEBUG_SYMBOLS!$DEBUG_SYMBOLS$ac_delim
1858718591
KEEP_SYMBOLS!$KEEP_SYMBOLS$ac_delim
1858818592
JIT!$JIT$ac_delim
@@ -18679,7 +18683,6 @@ HAVE_LIBZ!$HAVE_LIBZ$ac_delim
1867918683
HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim
1868018684
MMAP_FILE!$MMAP_FILE$ac_delim
1868118685
SHLIBEXT!$SHLIBEXT$ac_delim
18682-
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
1868318686
_ACEOF
1868418687

1868518688
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -18721,6 +18724,7 @@ _ACEOF
1872118724
ac_delim='%!_!# '
1872218725
for ac_last_try in false false false false false :; do
1872318726
cat >conf$$subs.sed <<_ACEOF
18727+
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
1872418728
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
1872518729
LLVM_DATADIR!$LLVM_DATADIR$ac_delim
1872618730
LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
@@ -18741,7 +18745,7 @@ LIBOBJS!$LIBOBJS$ac_delim
1874118745
LTLIBOBJS!$LTLIBOBJS$ac_delim
1874218746
_ACEOF
1874318747

18744-
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
18748+
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
1874518749
break
1874618750
elif $ac_last_try; then
1874718751
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

0 commit comments

Comments
 (0)