llvm.org GIT mirror llvm / 99d9863
Kill off LLVMGCC_MAJVERS make variable. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96907 91177308-0d34-0410-b5e6-96231b3b80d8 Daniel Dunbar 9 years ago
6 changed file(s) with 2 addition(s) and 25 deletion(s). Raw diff Collapse all Expand all
4141 EXTRA_DIST := test unittests llvm.spec include win32 Xcode
4242
4343 include $(LEVEL)/Makefile.config
44
45 # llvm-gcc4 doesn't need runtime libs. llvm-gcc4 is the only supported one.
46 # FIXME: Remove runtime entirely once we have an understanding of where
47 # libprofile etc should go.
48 #ifeq ($(LLVMGCC_MAJVERS),4)
49 # DIRS := $(filter-out runtime, $(DIRS))
50 #endif
5144
5245 ifeq ($(MAKECMDGOALS),libs-only)
5346 DIRS := $(filter-out tools runtime docs, $(DIRS))
183183 LLVMGCCDIR := @LLVMGCCDIR@
184184
185185 # Determine the target for which LLVM should generate code.
186 ifeq (@LLVMGCC_MAJVERS@,3)
187 LLVMGCCARCH := @target@/3.4-llvm
188 else
189186 LLVMGCCARCH := @target@/@LLVMGCC_VERSION@
190 endif
191187
192188 # Determine the path where the library executables are
193189 LLVMGCCLIBEXEC := @LLVMGCCLIBEXEC@
198194 LLVMCC1 := @LLVMCC1@
199195 LLVMCC1PLUS := @LLVMCC1PLUS@
200196 LLVMGCC_VERSION := @LLVMGCC_VERSION@
201 LLVMGCC_MAJVERS := @LLVMGCC_MAJVERS@
202197 LLVMGCC_LANGS := @LLVMGCC_LANGS@
203198
204199 # Path to directory where object files should be stored during a build.
531531 ifndef LUPGRADE
532532 LUPGRADE := $(LLVMToolDir)/llvm-upgrade$(EXEEXT)
533533 endif
534 ifeq ($(LLVMGCC_MAJVERS),3)
535 LLVMGCCWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGCC)
536 LLVMGXXWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGXX)
537 else
538534 LLVMGCCWITHPATH := $(LLVMGCC)
539535 LLVMGXXWITHPATH := $(LLVMGXX)
540 endif
541536
542537 #--------------------------------------------------------------------
543538 # Adjust to user's request
12541254 llvmgccversion=[`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'`]
12551255 llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`]
12561256 AC_SUBST(LLVMGCC_VERSION,$llvmgccversion)
1257 AC_SUBST(LLVMGCC_MAJVERS,$llvmgccmajvers)
12581257 llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`]
12591258 AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs)
12601259 AC_MSG_RESULT([ok])
765765 LLVMGCCDIR
766766 LLVMGCCLIBEXEC
767767 LLVMGCC_VERSION
768 LLVMGCC_MAJVERS
769768 LLVMGCC_LANGS
770769 SHLIBEXT
771770 LLVM_PREFIX
1103411033 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1103511034 lt_status=$lt_dlunknown
1103611035 cat > conftest.$ac_ext <
11037 #line 11038 "configure"
11036 #line 11037 "configure"
1103811037 #include "confdefs.h"
1103911038
1104011039 #if HAVE_DLFCN_H
1958119580 llvmgccversion=`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'`
1958219581 llvmgccmajvers=`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`
1958319582 LLVMGCC_VERSION=$llvmgccversion
19584
19585 LLVMGCC_MAJVERS=$llvmgccmajvers
1958619583
1958719584 llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`
1958819585 LLVMGCC_LANGS=$llvmgcclangs
2076920766 LLVMGCCDIR!$LLVMGCCDIR$ac_delim
2077020767 LLVMGCCLIBEXEC!$LLVMGCCLIBEXEC$ac_delim
2077120768 LLVMGCC_VERSION!$LLVMGCC_VERSION$ac_delim
20772 LLVMGCC_MAJVERS!$LLVMGCC_MAJVERS$ac_delim
2077320769 LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim
2077420770 SHLIBEXT!$SHLIBEXT$ac_delim
2077520771 LLVM_PREFIX!$LLVM_PREFIX$ac_delim
2079220788 LTLIBOBJS!$LTLIBOBJS$ac_delim
2079320789 _ACEOF
2079420790
20795 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
20791 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
2079620792 break
2079720793 elif $ac_last_try; then
2079820794 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1818 #set(LLVMGCC "")
1919 #set(LLVMGXX "")
2020 #set(LLVMGCC_VERSION "")
21 #set(LLVMGCC_MAJVERS "")
2221 test_big_endian(IS_BIG_ENDIAN)
2322 if( IS_BIG_ENDIAN )
2423 set(ENDIAN "big")