diff options
Diffstat (limited to 'sys-devel/llvm/files/llvm-3.9-llvm-config.patch')
-rw-r--r-- | sys-devel/llvm/files/llvm-3.9-llvm-config.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch deleted file mode 100644 index d4363ad..0000000 --- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch +++ /dev/null @@ -1,68 +0,0 @@ -From af798c5a6e4b2c6c98cce89b5d6fc8d33f9345cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH 1/2] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, -- making --build-mode return "Release" rather than "Gentoo". - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 20 +++++++++++++++----- - 2 files changed, 23 insertions(+), 8 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 32d0f4c..6e99832 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -29,2 +29,6 @@ set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_ --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}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -@@ -39 +43,2 @@ set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 94d426b..fb1bdfa 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -525 +525,2 @@ int main(int argc, char **argv) { -- OS << build_mode << '\n'; -+ // force Release since we force non-standard Gentoo build mode -+ OS << "Release" << '\n'; -@@ -540,4 +541,13 @@ int main(int argc, char **argv) { -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } --- -2.7.4 - |