diff options
| author | Eric Christopher <echristo@apple.com> | 2012-08-03 05:18:00 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2012-08-03 05:18:00 +0000 |
| commit | cbd84f7d8309996d1f5802c9fc54edaf4283bd57 (patch) | |
| tree | 82b438dc5a89f7194bee8c251f5b3a56a9a33f01 /configure | |
| parent | d49edb7ab098fa0c82f59efbcf1b4eb2958f8dc3 (diff) | |
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 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -765,6 +765,7 @@ USE_OPROFILE USE_INTEL_JITEVENTS INTEL_JITEVENTS_INCDIR INTEL_JITEVENTS_LIBDIR +BUILD_FLAGS HAVE_PTHREAD HUGE_VAL_SANITY MMAP_FILE @@ -10210,7 +10211,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10213 "configure" +#line 10214 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13073,7 +13074,7 @@ if test "${with_oprofile+set}" = set; then 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) @@ -13500,7 +13501,7 @@ echo "$as_me: error: LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}" - CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR" + BUILD_FLAGS="$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; } @@ -13791,6 +13792,8 @@ _ACEOF + + 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` @@ -22059,6 +22062,7 @@ USE_OPROFILE!$USE_OPROFILE$ac_delim 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 @@ -22084,7 +22088,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |