summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d49edb7)
raw | patch | inline | side by side (parent: d49edb7)
author | Eric Christopher <echristo@apple.com> | |
Fri, 3 Aug 2012 05:18:00 +0000 (05:18 +0000) | ||
committer | Eric Christopher <echristo@apple.com> | |
Fri, 3 Aug 2012 05:18:00 +0000 (05:18 +0000) |
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
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
Makefile.config.in | patch | blob | history | |
Makefile.rules | patch | blob | history | |
autoconf/configure.ac | patch | blob | history | |
configure | patch | blob | history |
diff --git a/Makefile.config.in b/Makefile.config.in
index cc538b3f42efb5ea625a99dd9b7d43472e893acd..a0c860776db4f385218ec6b76bd20e1f337eb9e6 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
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 644c356370daaf0806deb2d7dd73cb5d639e764d..080314fc35d1ece8409d1cd15a4b7f28d7b9fd00 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
endif
Compile.C = $(Compile.Wrapper) \
- $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
+ $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) -c
Compile.CXX = $(Compile.Wrapper) \
- $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) \
+ $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) -c
Preprocess.CXX= $(Compile.Wrapper) \
- $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
+ $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) $(BUILD_FLAGS) \
$(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 7d36a06f14bbd16c3162d8a5b9e3ef7797d164a8..aba46459edba09f1243f57af7178630c5f3c6dcc 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
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)
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"
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 fcd9179d35e2629386c436769f21fc42fa3e2d8b..1981b1d0624343962e6fc339a1d9628db491bcc0 100755 (executable)
--- a/configure
+++ b/configure
USE_INTEL_JITEVENTS
INTEL_JITEVENTS_INCDIR
INTEL_JITEVENTS_LIBDIR
+BUILD_FLAGS
HAVE_PTHREAD
HUGE_VAL_SANITY
MMAP_FILE
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
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)
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; }
+
+
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`
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
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