diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-01-20 23:37:42 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-01-24 00:37:02 -0500 |
commit | fb362d85819bb0f2be6fa5eea7594270c4ced483 (patch) | |
tree | 8c52bca5d1afe70f597a5680b8dc04ad6484e69b | |
parent | c02adc7fdce0f4bd29617d1f583aa5cdfa485769 (diff) | |
download | meta-clang-fb362d85819bb0f2be6fa5eea7594270c4ced483.tar.gz |
libcxx,compiler-rt: Append to CXX along with TARGET_CXXFLAGS to carry -stdlib flag
Since TARGET_CXXFLAGS does not get passed into all packages
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | README.md | 8 | ||||
-rw-r--r-- | recipes-devtools/clang/compiler-rt_git.bb | 6 | ||||
-rw-r--r-- | recipes-devtools/clang/libcxx_git.bb | 3 |
3 files changed, 10 insertions, 7 deletions
@@ -45,14 +45,16 @@ Note that by default libstdc++ will remain the default C++ standard library, how | |||
45 | libc++ to be the default one then set | 45 | libc++ to be the default one then set |
46 | 46 | ||
47 | ```python | 47 | ```python |
48 | TARGET_CXXFLAGS_append_toolchain-clang ?= " -stdlib=libc++ " | 48 | CXX_append_toolchain-clang = " -stdlib=libc++ " |
49 | TARGET_CXXFLAGS_append_toolchain-clang = " -stdlib=libc++ " | ||
49 | ``` | 50 | ``` |
50 | 51 | ||
51 | in local.conf. | 52 | in local.conf. |
52 | You can select libc++ per package too by writing bbappends for them containing | 53 | You can select libc++ per package too by writing bbappends for them containing |
53 | 54 | ||
54 | ```python | 55 | ```python |
55 | TARGET_CXXFLAGS_append_toolchain-clang = " -stdlib=libc++ " | 56 | CXX_append_toolchain-clang_pn-<recipe> = " -stdlib=libc++ " |
57 | TARGET_CXXFLAGS_append_toolchain-clang_pn-<recipe> = " -stdlib=libc++ " | ||
56 | ``` | 58 | ``` |
57 | 59 | ||
58 | # Building | 60 | # Building |
@@ -82,7 +84,7 @@ and OE will start using gcc to cross compile that recipe. | |||
82 | And if a component does not build with libc++, you can add it to conf/nonclangable.inc e.g. | 84 | And if a component does not build with libc++, you can add it to conf/nonclangable.inc e.g. |
83 | 85 | ||
84 | ```shell | 86 | ```shell |
85 | TARGET_CXXFLAGS_remove_pn-<recipe>_toolchain-clang = " -stdlib=libc++ " | 87 | CXX_remove_pn-<recipe>_toolchain-clang = " -stdlib=libc++ " |
86 | ``` | 88 | ``` |
87 | 89 | ||
88 | # Dependencies | 90 | # Dependencies |
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 68655e3..2cfbf71 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb | |||
@@ -15,9 +15,9 @@ inherit cmake pkgconfig pythonnative | |||
15 | LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=f981c4637a4cd67915ac527b3ead3a59; \ | 15 | LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=f981c4637a4cd67915ac527b3ead3a59; \ |
16 | " | 16 | " |
17 | 17 | ||
18 | BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt" | 18 | BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt libcxx" |
19 | BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx" | 19 | CXX_remove_toolchain-clang = "-stdlib=libc++" |
20 | TARGET_CXXFLAGS_remove_toolchain-clang = " -stdlib=libc++ " | 20 | TARGET_CXXFLAGS_remove_toolchain-clang = "-stdlib=libc++" |
21 | TUNE_CCARGS_remove = "-no-integrated-as" | 21 | TUNE_CCARGS_remove = "-no-integrated-as" |
22 | DEPENDS += "ninja-native" | 22 | DEPENDS += "ninja-native" |
23 | DEPENDS_append_class-nativesdk = " clang-native" | 23 | DEPENDS_append_class-nativesdk = " clang-native" |
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index a90cd2f..28ea5eb 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb | |||
@@ -13,7 +13,8 @@ inherit cmake pythonnative | |||
13 | 13 | ||
14 | DEPENDS += "ninja-native" | 14 | DEPENDS += "ninja-native" |
15 | BASEDEPENDS_remove_toolchain-clang = "libcxx" | 15 | BASEDEPENDS_remove_toolchain-clang = "libcxx" |
16 | TARGET_CXXFLAGS_remove_toolchain-clang = " -stdlib=libc++ " | 16 | CXX_remove_toolchain-clang = "-stdlib=libc++" |
17 | TARGET_CXXFLAGS_remove_toolchain-clang = "-stdlib=libc++" | ||
17 | 18 | ||
18 | PACKAGECONFIG ??= "unwind" | 19 | PACKAGECONFIG ??= "unwind" |
19 | PACKAGECONFIG_powerpc = "" | 20 | PACKAGECONFIG_powerpc = "" |