diff options
Diffstat (limited to 'sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch')
| -rw-r--r-- | sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch new file mode 100644 index 00000000000..87f9ff8c5ad --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch @@ -0,0 +1,83 @@ +From a59464503a7e059ddfd3fb4308753b692d03d996 Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Wed, 9 Sep 2015 16:39:30 +0000 +Subject: [PATCH 1/4] llvm-config: Add --build-system option + +Summary: +This can be used for distinguishing between cmake and autoconf builds. +Users may need this in order to handle inconsistencies between the +outputs of the two build systems. + +Reviewers: echristo, chandlerc, beanz + +Subscribers: llvm-commits + +Differential Revision: http://reviews.llvm.org/D11838 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247159 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + tools/llvm-config/BuildVariables.inc.in | 1 + + tools/llvm-config/CMakeLists.txt | 2 ++ + tools/llvm-config/Makefile | 2 ++ + tools/llvm-config/llvm-config.cpp | 3 +++ + 4 files changed, 8 insertions(+) + +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 3f51f49..0f28fad 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -26,3 +26,4 @@ + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" ++#define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt +index edbd8c9..dd53460 100644 +--- a/tools/llvm-config/CMakeLists.txt ++++ b/tools/llvm-config/CMakeLists.txt +@@ -24,6 +24,8 @@ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) + set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") + set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") + set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") ++set(LLVM_BUILD_SYSTEM cmake) ++ + # Use the C++ link flags, since they should be a superset of C link flags. + set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") + set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) +diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile +index 1ff8b6f..c2b5e8f 100644 +--- a/tools/llvm-config/Makefile ++++ b/tools/llvm-config/Makefile +@@ -65,6 +65,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir + >> temp.sed + $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ + >> temp.sed ++ $(Verb) $(ECHO) 's/@LLVM_BUILD_SYSTEM@/autoconf/' \ ++ >> temp.sed + $(Verb) $(SED) -f temp.sed < $< > $@ + $(Verb) $(RM) temp.sed + +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 879b9ab..4ce8f10 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -157,6 +157,7 @@ Options:\n\ + --host-target Target triple used to configure LLVM.\n\ + --build-mode Print build mode of LLVM tree (e.g. Debug or Release).\n\ + --assertion-mode Print assertion mode of LLVM tree (ON or OFF).\n\ ++ --build-system Print the build system used to build LLVM (autoconf or cmake).\n\ + Typical components:\n\ + all All LLVM libraries (default).\n\ + engine Either a native JIT or a bitcode interpreter.\n"; +@@ -323,6 +324,8 @@ int main(int argc, char **argv) { + #else + OS << "ON\n"; + #endif ++ } else if (Arg == "--build-system") { ++ OS << LLVM_BUILD_SYSTEM << '\n'; + } else if (Arg == "--obj-root") { + OS << ActivePrefix << '\n'; + } else if (Arg == "--src-root") { +-- +2.7.4 + |