diff options
Diffstat (limited to 'recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch')
-rw-r--r-- | recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch b/recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch index a887588..14db1e6 100644 --- a/recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch +++ b/recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 63b01a5bf84c836a42b792cdee5ac6322296ae0b Mon Sep 17 00:00:00 2001 | 1 | From b47912e2304c1e3d3bca7e973037b859739aea15 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 16 Mar 2017 17:06:45 -0700 | 3 | Date: Thu, 16 Mar 2017 19:06:26 -0700 |
4 | Subject: [PATCH 5/5] clang: Look inside the target sysroot for compiler | 4 | Subject: [PATCH 5/6] clang: Look inside the target sysroot for compiler |
5 | runtime | 5 | runtime |
6 | 6 | ||
7 | In OE compiler-rt and libc++ are built and staged into target | 7 | In OE compiler-rt and libc++ are built and staged into target |
@@ -12,22 +12,22 @@ Specific to cross compiling the way yocto/OE works | |||
12 | 12 | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | --- | 14 | --- |
15 | lib/Driver/ToolChain.cpp | 4 +++- | 15 | lib/Driver/ToolChain.cpp | 6 +++++- |
16 | 1 file changed, 3 insertions(+), 1 deletion(-) | 16 | 1 file changed, 5 insertions(+), 1 deletion(-) |
17 | 17 | ||
18 | Index: clang/lib/Driver/ToolChain.cpp | 18 | diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp |
19 | =================================================================== | 19 | index 4f82503276..507e051afc 100644 |
20 | --- clang.orig/lib/Driver/ToolChain.cpp | 20 | --- a/lib/Driver/ToolChain.cpp |
21 | +++ clang/lib/Driver/ToolChain.cpp | 21 | +++ b/lib/Driver/ToolChain.cpp |
22 | @@ -10,6 +10,7 @@ | 22 | @@ -12,6 +12,7 @@ |
23 | #include "clang/Driver/ToolChain.h" | 23 | #include "ToolChains/Arch/ARM.h" |
24 | #include "Tools.h" | 24 | #include "ToolChains/Clang.h" |
25 | #include "clang/Basic/ObjCRuntime.h" | 25 | #include "clang/Basic/ObjCRuntime.h" |
26 | +#include "clang/Basic/Version.h" | 26 | +#include "clang/Basic/Version.h" |
27 | #include "clang/Basic/VirtualFileSystem.h" | ||
27 | #include "clang/Config/config.h" | 28 | #include "clang/Config/config.h" |
28 | #include "clang/Driver/Action.h" | 29 | #include "clang/Driver/Action.h" |
29 | #include "clang/Driver/Driver.h" | 30 | @@ -320,7 +321,10 @@ std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component, |
30 | @@ -306,7 +307,10 @@ std::string ToolChain::getCompilerRT(con | ||
31 | const char *Suffix = Shared ? (Triple.isOSWindows() ? ".dll" : ".so") | 31 | const char *Suffix = Shared ? (Triple.isOSWindows() ? ".dll" : ".so") |
32 | : (IsITANMSVCWindows ? ".lib" : ".a"); | 32 | : (IsITANMSVCWindows ? ".lib" : ".a"); |
33 | 33 | ||
@@ -39,3 +39,6 @@ Index: clang/lib/Driver/ToolChain.cpp | |||
39 | StringRef OSLibName = Triple.isOSFreeBSD() ? "freebsd" : getOS(); | 39 | StringRef OSLibName = Triple.isOSFreeBSD() ? "freebsd" : getOS(); |
40 | llvm::sys::path::append(Path, "lib", OSLibName); | 40 | llvm::sys::path::append(Path, "lib", OSLibName); |
41 | llvm::sys::path::append(Path, Prefix + Twine("clang_rt.") + Component + "-" + | 41 | llvm::sys::path::append(Path, Prefix + Twine("clang_rt.") + Component + "-" + |
42 | -- | ||
43 | 2.13.0 | ||
44 | |||