1 --- llvm-3.4.1.src/autoconf/configure.ac.orig 2014-05-21 18:37:05.321379360 +0200
2 +++ llvm-3.4.1.src/autoconf/configure.ac 2014-05-21 18:40:49.568041358 +0200
4 eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
5 eval LLVM_ETCDIR="${prefix}/etc/llvm";
6 eval LLVM_INCLUDEDIR="${prefix}/include";
7 -eval LLVM_INFODIR="${prefix}/info";
8 -eval LLVM_MANDIR="${prefix}/man";
9 +eval LLVM_INFODIR="${datadir}/info";
10 +eval LLVM_MANDIR="${datadir}/man";
11 +eval LLVM_LIBDIR="${libdir}";
12 +eval LLVM_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib(.*)(/.*|$),\1,'`";
13 +eval CLANG_LIBDIR_SUFFIX="`echo ${libdir} | sed 's,.*/lib(.*)(/.*|$),\1,'`";
14 LLVM_CONFIGTIME=`date`
18 AC_SUBST(LLVM_INCLUDEDIR)
19 AC_SUBST(LLVM_INFODIR)
21 +AC_SUBST(LLVM_LIBDIR)
22 +AC_SUBST(LLVM_LIBDIR_SUFFIX)
23 +AC_SUBST(CLANG_LIBDIR_SUFFIX)
24 AC_SUBST(LLVM_CONFIGTIME)
26 dnl Disable embedding timestamps in the build directory, with ENABLE_TIMESTAMPS.
27 @@ -1851,6 +1851,12 @@
28 [Installation directory for .info files])
29 AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR",
30 [Installation directory for man pages])
31 +AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
32 + [Installation directory for libraries])
33 +AC_DEFINE_UNQUOTED(LLVM_LIBDIR_SUFFIX, "$LLVM_LIBDIR_SUFFIX",
34 + [Installation directory for libraries])
35 +AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX, "$CLANG_LIBDIR_SUFFIX",
36 + [Installation directory for libraries])
37 AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME",
38 [Time at which LLVM was configured])
39 AC_DEFINE_UNQUOTED(LLVM_HOST_TRIPLE, "$host",
40 --- llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2014-08-27 22:07:31.000000000 +0200
41 +++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp 2014-10-01 20:56:40.312848502 +0200
42 @@ -2999,19 +2999,6 @@
43 return Triple.isArch32Bit() ? "lib" : "lib64";
46 - // It happens that only x86 and PPC use the 'lib32' variant of oslibdir, and
47 - // using that variant while targeting other architectures causes problems
48 - // because the libraries are laid out in shared system roots that can't cope
49 - // with a 'lib32' library search path being considered. So we only enable
50 - // them when we know we may need it.
52 - // FIXME: This is a bit of a hack. We should really unify this code for
53 - // reasoning about oslibdir spellings with the lib dir spellings in the
54 - // GCCInstallationDetector, but that is a more significant refactoring.
55 - if (Triple.getArch() == llvm::Triple::x86 ||
56 - Triple.getArch() == llvm::Triple::ppc)
59 if (Triple.getArch() == llvm::Triple::x86_64 &&
60 Triple.getEnvironment() == llvm::Triple::GNUX32)
63 // Try walking via the GCC triple path in case of biarch or multiarch GCC
64 // installations with strange symlinks.
65 if (GCCInstallation.isValid()) {
66 - addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
67 + addPathIfExists(SysRoot + "/usr/" + OSLibDir + "/" + GCCInstallation.getTriple().str() +
68 "/../../" + OSLibDir, Paths);
70 // Add the 'other' biarch variant path
71 @@ -3190,10 +3177,10 @@
72 // FIXME: It's not clear whether we should use the driver's installed
73 // directory ('Dir' below) or the ResourceDir.
74 if (StringRef(D.Dir).startswith(SysRoot))
75 - addPathIfExists(D.Dir + "/../lib", Paths);
76 + addPathIfExists(D.Dir + "/../" + OSLibDir, Paths);
78 - addPathIfExists(SysRoot + "/lib", Paths);
79 - addPathIfExists(SysRoot + "/usr/lib", Paths);
80 + addPathIfExists(SysRoot + "/" + OSLibDir, Paths);
81 + addPathIfExists(SysRoot + "/usr/" + OSLibDir, Paths);
84 bool Linux::HasNativeLLVMSupport() const {
85 --- llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp.orig 2014-08-07 06:51:51.000000000 +0200
86 +++ llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp 2014-10-01 21:04:32.002828710 +0200
87 @@ -2037,12 +2038,7 @@
89 static SmallString<128> getCompilerRTLibDir(const ToolChain &TC) {
90 // The runtimes are located in the OS-specific resource directory.
91 - SmallString<128> Res(TC.getDriver().ResourceDir);
92 - const llvm::Triple &Triple = TC.getTriple();
93 - // TC.getOS() yield "freebsd10.0" whereas "freebsd" is expected.
94 - StringRef OSLibName = (Triple.getOS() == llvm::Triple::FreeBSD) ?
95 - "freebsd" : TC.getOS();
96 - llvm::sys::path::append(Res, "lib", OSLibName);
97 + SmallString<128> Res(LLVM_LIBDIR);
101 @@ -5899,9 +5895,9 @@
103 const char *LinkingOutput) const {
104 // FIXME: Find a real GCC, don't hard-code versions here
105 - std::string GCCLibPath = "/usr/gcc/4.5/lib/gcc/";
106 + std::string GCCLibPath = LLVM_LIBDIR "/gcc/";
107 const llvm::Triple &T = getToolChain().getTriple();
108 - std::string LibPath = "/usr/lib/";
109 + std::string LibPath = LLVM_LIBDIR "/";
110 llvm::Triple::ArchType Arch = T.getArch();
112 case llvm::Triple::x86:
113 --- llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile.orig 2014-05-22 23:13:30.000000000 +0200
114 +++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile 2014-10-18 22:10:17.008329250 +0200
116 $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
118 ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
119 -PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
120 +PROJ_resources := $(DESTDIR)$(PROJ_libdir)/clang/$(CLANG_VERSION)
122 ResourceLibDir := $(ResourceDir)/lib
123 ResourceIncludeDir := $(ResourceDir)/include