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
diff --git a/Makefile.config.in b/Makefile.config.in
index a0c8607..cc538b3 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -196,7 +196,6 @@
HAVE_PTHREAD := @HAVE_PTHREAD@
LIBS := @LIBS@
-BUILD_FLAGS := @BUILD_FLAGS@
# Targets that we should build
TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
diff --git a/Makefile.rules b/Makefile.rules
index 080314f..644c356 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -730,13 +730,13 @@
endif
Compile.C = $(Compile.Wrapper) \
- $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \
+ $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) -c
Compile.CXX = $(Compile.Wrapper) \
- $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \
+ $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) -c
Preprocess.CXX= $(Compile.Wrapper) \
- $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) $(BUILD_FLAGS) \
+ $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
$(CompileCommonOpts) $(CXX.Flags) -E
Link = $(Compile.Wrapper) \
$(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index aba4645..7d36a06 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1201,7 +1201,7 @@
no) llvm_cv_oppath=
AC_SUBST(USE_OPROFILE, [0]) ;;
*) llvm_cv_oppath="${withval}/lib/oprofile"
- BUILD_FLAGS="-I${withval}/include";;
+ CPPFLAGS="-I${withval}/include";;
esac
case $llvm_cv_os_type in
Linux)
@@ -1262,7 +1262,7 @@
AC_SUBST(INTEL_JITEVENTS_LIBDIR)
LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
- BUILD_FLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
+ CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
AC_SEARCH_LIBS(iJIT_IsProfilingActive, jitprofiling, [], [
echo "Error! Cannot find libjitprofiling.a. Please check path specified in flag --with-intel-jitevents"
@@ -1280,9 +1280,6 @@
AC_DEFINE_UNQUOTED([LLVM_USE_INTEL_JITEVENTS],$USE_INTEL_JITEVENTS,
[Define if we have the Intel JIT API runtime support library])
-dnl Substitute this here for now.
-AC_SUBST(BUILD_FLAGS)
-
dnl===-----------------------------------------------------------------------===
dnl===
dnl=== SECTION 6: Check for header files
diff --git a/configure b/configure
index 1981b1d..fcd9179 100755
--- a/configure
+++ b/configure
@@ -765,7 +765,6 @@
USE_INTEL_JITEVENTS
INTEL_JITEVENTS_INCDIR
INTEL_JITEVENTS_LIBDIR
-BUILD_FLAGS
HAVE_PTHREAD
HUGE_VAL_SANITY
MMAP_FILE
@@ -10211,7 +10210,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10214 "configure"
+#line 10213 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13074,7 +13073,7 @@
USE_OPROFILE=0
;;
*) llvm_cv_oppath="${withval}/lib/oprofile"
- BUILD_FLAGS="-I${withval}/include";;
+ CPPFLAGS="-I${withval}/include";;
esac
case $llvm_cv_os_type in
Linux)
@@ -13501,7 +13500,7 @@
LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
- BUILD_FLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
+ CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
{ echo "$as_me:$LINENO: checking for library containing iJIT_IsProfilingActive" >&5
echo $ECHO_N "checking for library containing iJIT_IsProfilingActive... $ECHO_C" >&6; }
@@ -13792,8 +13791,6 @@
-
-
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -22062,7 +22059,6 @@
USE_INTEL_JITEVENTS!$USE_INTEL_JITEVENTS$ac_delim
INTEL_JITEVENTS_INCDIR!$INTEL_JITEVENTS_INCDIR$ac_delim
INTEL_JITEVENTS_LIBDIR!$INTEL_JITEVENTS_LIBDIR$ac_delim
-BUILD_FLAGS!$BUILD_FLAGS$ac_delim
HAVE_PTHREAD!$HAVE_PTHREAD$ac_delim
HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim
MMAP_FILE!$MMAP_FILE$ac_delim
@@ -22088,7 +22084,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5