Skip to content

Commit ee752be

Browse files
krajRaphael Kubo da Costa
authored and
Raphael Kubo da Costa
committed
chromium: Set LIBCPLUSPLUS to use libc++
This should fix issue seen with #551 Explicitly add dependency on libcxx to fix: #556 #554 for hardknott and older. Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Martin Jansa <[email protected]>
1 parent c987940 commit ee752be

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,21 @@ TOOLCHAIN:class-native = "clang"
2424
# https://github.com/kraj/meta-clang/issues/449).
2525
RUNTIME = "llvm"
2626

27+
# meta-clang uses RUNTIME variable to add build dependencies on libcxx/compiler-rt
28+
# but does not add compiler options to commandline. It expects compiler's own
29+
# defaults to be used and compiler's buildtime defaults are chosen based on
30+
# global RUNTIME variable setting when building clang compiler, which defaults to 'gnu'.
31+
# For chromium libc++ is expected to be used therefore ensure that
32+
# right build flags are set for chromium irrespective of
33+
# distro defaults (which could be 'gnu' or 'llvm').
34+
# This also ensures that it does not rely too much on meta-clang's defaults.
35+
LIBCPLUSPLUS = "-stdlib=libc++"
36+
37+
# Explicitly add dependency on libcxx, because meta-clang/hardknott checks for
38+
# --stdlib=libc++ in LIBCPLUSPLUS (with extra dash, which was removed in
39+
# newer meta-clang in https://github.com/kraj/meta-clang/commit/cda2283e4cf3c90ea42b43dbc3a2268be6655670)
40+
DEPENDS += "libcxx"
41+
2742
inherit mime-xdg pythonnative
2843
DEPENDS += "python-setuptools-native"
2944

0 commit comments

Comments
 (0)