Skip to content

Commit 3226365

Browse files
shr-projectRaphael Kubo da Costa
authored andcommitted
gn-utils.inc: use target variables without TARGET_ prefix
* CXXFLAGS compared with TARGET_CXXFLAGS have few more options meta/conf/distro/include/tclibc-glibc.inc appends -fvisibility-inlines-hidden meta-clang/classes/clang.bbclass appends ${LIBCPLUSPLUS} * we can use this instead of adding LIBCPLUSPLUS to TUNE_CCARGS in #554 * instead of ${TARGET_PREFIX}readelf use READELF variable from bitbake.conf: it uses HOST_PREFIX which is better and is available since morty with: https://git.openembedded.org/openembedded-core/commit/?id=3442ee423813d547be7899a25ea31efe719e662f Signed-off-by: Martin Jansa <[email protected]> Signed-off-by: Khem Raj <[email protected]>
1 parent e109eb7 commit 3226365

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ RUNTIME = "llvm"
3434
# This also ensures that it does not rely too much on meta-clang's defaults.
3535
LIBCPLUSPLUS = "-stdlib=libc++"
3636

37-
# LIBCPLUSPLUS is included in CXXFLAGS and LDFLAGS, but chromium doesn't respect it
38-
# add it to TUNE_CCARGS as well to include it in CC/CXX variables which are respected.
39-
TUNE_CCARGS += "${LIBCPLUSPLUS}"
40-
4137
inherit mime-xdg pythonnative
4238
DEPENDS += "python-setuptools-native"
4339

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ def write_toolchain_file(d, file_path):
9393
'cxx': d.expand('${CXX}'),
9494
'ar': d.expand('${AR}'),
9595
'nm': d.expand('${NM}'),
96-
'readelf': d.expand('${TARGET_PREFIX}readelf'),
97-
'extra_cflags': d.expand('${TARGET_CFLAGS}'),
98-
'extra_cppflags': d.expand('${TARGET_CPPFLAGS}'),
99-
'extra_cxxflags': d.expand('${TARGET_CXXFLAGS}'),
100-
'extra_ldflags': d.expand('${TARGET_LDFLAGS}'),
96+
'readelf': d.expand('${READELF}'),
97+
'extra_cflags': d.expand('${CFLAGS}'),
98+
'extra_cppflags': d.expand('${CPPFLAGS}'),
99+
'extra_cxxflags': d.expand('${CXXFLAGS}'),
100+
'extra_ldflags': d.expand('${LDFLAGS}'),
101101
}
102102

103103
with open(file_path, 'w') as toolchain_file:

0 commit comments

Comments
 (0)