summaryrefslogtreecommitdiff
path: root/autoconf
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2012-08-03 05:18:00 +0000
committerEric Christopher <echristo@apple.com>2012-08-03 05:18:00 +0000
commitcbd84f7d8309996d1f5802c9fc54edaf4283bd57 (patch)
tree82b438dc5a89f7194bee8c251f5b3a56a9a33f01 /autoconf
parentd49edb7ab098fa0c82f59efbcf1b4eb2958f8dc3 (diff)
downloadllvm-cbd84f7d8309996d1f5802c9fc54edaf4283bd57.tar.gz
llvm-cbd84f7d8309996d1f5802c9fc54edaf4283bd57.tar.bz2
llvm-cbd84f7d8309996d1f5802c9fc54edaf4283bd57.tar.xz
Add a BUILD_FLAGS variable so that autoconf checks have a place
to store additional flag options since too many things can and do override CPPFLAGS. Also, this is exported, unlike CPPFLAGS so it can be actually used elsewhere. This should enable us to remove the AC_SUBSTs in the intel checks, but I have no way of testing it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161233 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf')
-rw-r--r--autoconf/configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 7d36a06f14..aba46459ed 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1201,7 +1201,7 @@ AC_ARG_WITH(oprofile,
no) llvm_cv_oppath=
AC_SUBST(USE_OPROFILE, [0]) ;;
*) llvm_cv_oppath="${withval}/lib/oprofile"
- CPPFLAGS="-I${withval}/include";;
+ BUILD_FLAGS="-I${withval}/include";;
esac
case $llvm_cv_os_type in
Linux)
@@ -1262,7 +1262,7 @@ AC_ARG_WITH(intel-jitevents,
AC_SUBST(INTEL_JITEVENTS_LIBDIR)
LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
- CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
+ BUILD_FLAGS="$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,6 +1280,9 @@ AC_ARG_WITH(intel-jitevents,
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