llvm.org GIT mirror llvm / 42dffa5
Revert previous patch here, we should instead configure in specific packages for particular uses. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161246 91177308-0d34-0410-b5e6-96231b3b80d8 Eric Christopher 7 years ago
4 changed file(s) with 9 addition(s) and 17 deletion(s). Raw diff Collapse all Expand all
195195 HAVE_PTHREAD := @HAVE_PTHREAD@
196196
197197 LIBS := @LIBS@
198 BUILD_FLAGS := @BUILD_FLAGS@
199198
200199 # Targets that we should build
201200 TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
729729 endif
730730
731731 Compile.C = $(Compile.Wrapper) \
732 $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \
732 $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
733733 $(TargetCommonOpts) $(CompileCommonOpts) -c
734734 Compile.CXX = $(Compile.Wrapper) \
735 $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \
735 $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) \
736736 $(TargetCommonOpts) $(CompileCommonOpts) -c
737737 Preprocess.CXX= $(Compile.Wrapper) \
738 $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) $(BUILD_FLAGS) \
738 $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
739739 $(CompileCommonOpts) $(CXX.Flags) -E
740740 Link = $(Compile.Wrapper) \
741741 $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \
12001200 no) llvm_cv_oppath=
12011201 AC_SUBST(USE_OPROFILE, [0]) ;;
12021202 *) llvm_cv_oppath="${withval}/lib/oprofile"
1203 BUILD_FLAGS="-I${withval}/include";;
1203 CPPFLAGS="-I${withval}/include";;
12041204 esac
12051205 case $llvm_cv_os_type in
12061206 Linux)
12611261 AC_SUBST(INTEL_JITEVENTS_LIBDIR)
12621262
12631263 LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
1264 BUILD_FLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
1264 CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
12651265
12661266 AC_SEARCH_LIBS(iJIT_IsProfilingActive, jitprofiling, [], [
12671267 echo "Error! Cannot find libjitprofiling.a. Please check path specified in flag --with-intel-jitevents"
12781278 ])
12791279 AC_DEFINE_UNQUOTED([LLVM_USE_INTEL_JITEVENTS],$USE_INTEL_JITEVENTS,
12801280 [Define if we have the Intel JIT API runtime support library])
1281
1282 dnl Substitute this here for now.
1283 AC_SUBST(BUILD_FLAGS)
12841281
12851282 dnl===-----------------------------------------------------------------------===
12861283 dnl===
764764 USE_INTEL_JITEVENTS
765765 INTEL_JITEVENTS_INCDIR
766766 INTEL_JITEVENTS_LIBDIR
767 BUILD_FLAGS
768767 HAVE_PTHREAD
769768 HUGE_VAL_SANITY
770769 MMAP_FILE
1021010209 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1021110210 lt_status=$lt_dlunknown
1021210211 cat > conftest.$ac_ext <
10213 #line 10214 "configure"
10212 #line 10213 "configure"
1021410213 #include "confdefs.h"
1021510214
1021610215 #if HAVE_DLFCN_H
1307313072 USE_OPROFILE=0
1307413073 ;;
1307513074 *) llvm_cv_oppath="${withval}/lib/oprofile"
13076 BUILD_FLAGS="-I${withval}/include";;
13075 CPPFLAGS="-I${withval}/include";;
1307713076 esac
1307813077 case $llvm_cv_os_type in
1307913078 Linux)
1350013499
1350113500
1350213501 LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
13503 BUILD_FLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
13502 CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
1350413503
1350513504 { echo "$as_me:$LINENO: checking for library containing iJIT_IsProfilingActive" >&5
1350613505 echo $ECHO_N "checking for library containing iJIT_IsProfilingActive... $ECHO_C" >&6; }
1378313782 cat >>confdefs.h <<_ACEOF
1378413783 #define LLVM_USE_INTEL_JITEVENTS $USE_INTEL_JITEVENTS
1378513784 _ACEOF
13786
13787
1378813785
1378913786
1379013787
2206122058 USE_INTEL_JITEVENTS!$USE_INTEL_JITEVENTS$ac_delim
2206222059 INTEL_JITEVENTS_INCDIR!$INTEL_JITEVENTS_INCDIR$ac_delim
2206322060 INTEL_JITEVENTS_LIBDIR!$INTEL_JITEVENTS_LIBDIR$ac_delim
22064 BUILD_FLAGS!$BUILD_FLAGS$ac_delim
2206522061 HAVE_PTHREAD!$HAVE_PTHREAD$ac_delim
2206622062 HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim
2206722063 MMAP_FILE!$MMAP_FILE$ac_delim
2208722083 LTLIBOBJS!$LTLIBOBJS$ac_delim
2208822084 _ACEOF
2208922085
22090 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
22086 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
2209122087 break
2209222088 elif $ac_last_try; then
2209322089 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5