mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 01:16:59 +02:00
fix(coreos-base/libchromeos): Fix building with sysroot-wrappers
Tell the scons build to pass the PATH environment variable through.
This commit is contained in:
parent
0ff9fe09d6
commit
e8b1ef8bc2
@ -0,0 +1,13 @@
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 11219ed..41d12a6 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -31,7 +31,7 @@ def common_env():
|
||||
env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
|
||||
|
||||
# Fix issue with scons not passing some vars through the environment.
|
||||
- for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
|
||||
+ for key in Split('PATH PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
|
||||
if os.environ.has_key(key):
|
||||
env['ENV'][key] = os.environ[key]
|
||||
|
@ -8,7 +8,7 @@ CROS_WORKON_PROJECT="chromiumos/platform/libchromeos"
|
||||
|
||||
LIBCHROME_VERS=( 180609 )
|
||||
|
||||
inherit toolchain-funcs cros-debug cros-workon scons-utils
|
||||
inherit eutils toolchain-funcs cros-debug cros-workon scons-utils
|
||||
|
||||
DESCRIPTION="Chrome OS base library."
|
||||
HOMEPAGE="http://www.chromium.org/"
|
||||
@ -40,6 +40,10 @@ cr_scons() {
|
||||
BASE_VER=${v} escons -C ${v} -Y "${S}" "$@"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${P}-preserve-path.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX AR RANLIB LD NM PKG_CONFIG
|
||||
cros-debug-add-NDEBUG
|
||||
|
Loading…
Reference in New Issue
Block a user