Versionize for parallel installation with newer llvm
[git/cygwin-packages/llvm3.5.git] / 3.5.2-llvm-config.patch
CommitLineData
3b9f5fc1
YS
1--- origsrc/llvm-3.5.2.src/Makefile.config.in 2014-07-16 11:50:34.000000000 -0500
2+++ src/llvm-3.5.2.src/Makefile.config.in 2016-03-28 20:54:17.679722200 -0500
3@@ -103,7 +103,7 @@ PROJ_libdir := $(PROJ_prefix)/lib
4 PROJ_datadir := $(PROJ_prefix)/share
5 PROJ_docsdir := $(PROJ_prefix)/docs/llvm
6 PROJ_etcdir := $(PROJ_prefix)/etc/llvm
7-PROJ_includedir := $(PROJ_prefix)/include
8+PROJ_includedir := $(PROJ_prefix)/include/llvm-$(LLVMVersion)
9 PROJ_infodir := $(PROJ_prefix)/info
10 PROJ_mandir := $(PROJ_prefix)/share/man
11
12--- origsrc/llvm-3.5.2.src/tools/llvm-config/llvm-config.cpp 2014-03-28 20:08:53.000000000 -0500
13+++ src/llvm-3.5.2.src/tools/llvm-config/llvm-config.cpp 2016-03-28 20:54:17.685222900 -0500
14@@ -234,7 +234,7 @@ int main(int argc, char **argv) {
15 std::string ActivePrefix, ActiveBinDir, ActiveIncludeDir, ActiveLibDir;
16 std::string ActiveIncludeOption;
17 if (IsInDevelopmentTree) {
18- ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include";
19+ ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include/llvm-" + PACKAGE_VERSION;
20 ActivePrefix = CurrentExecPrefix;
21
22 // CMake organizes the products differently than a normal prefix style
23@@ -258,10 +258,10 @@ int main(int argc, char **argv) {
24
25 // We need to include files from both the source and object trees.
26 ActiveIncludeOption = ("-I" + ActiveIncludeDir + " " +
27- "-I" + ActiveObjRoot + "/include");
28+ "-I" + ActiveObjRoot + "/include/llvm-" + PACKAGE_VERSION);
29 } else {
30 ActivePrefix = CurrentExecPrefix;
31- ActiveIncludeDir = ActivePrefix + "/include";
32+ ActiveIncludeDir = ActivePrefix + "/include/llvm-" + PACKAGE_VERSION;
33 ActiveBinDir = ActivePrefix + "/bin";
34 ActiveLibDir = ActivePrefix + "/lib";
35 ActiveIncludeOption = "-I" + ActiveIncludeDir;
36@@ -294,7 +294,7 @@ int main(int argc, char **argv) {
37 } else if (Arg == "--system-libs") {
38 PrintSystemLibs = true;
39 } else if (Arg == "--libs") {
40- PrintLibs = true;
41+ OS << "-lLLVM-" << PACKAGE_VERSION << '\n';
42 } else if (Arg == "--libnames") {
43 PrintLibNames = true;
44 } else if (Arg == "--libfiles") {
This page took 0.021048 seconds and 5 git commands to generate.