diff options
| author |   Ross Burton <ross.burton@arm.com> | 2023-02-16 18:46:14 +0000 |
|---|---|---|
| committer | Ross Burton <ross.burton@arm.com> | 2023-02-16 19:08:53 +0000 |
| commit | c0c206e1e7b7d87f9688f00e98733842beb52630 (patch) | |
| tree | 1264f86b4c429b602b15d6a39e8da855ed07648e | |
| parent | 91576b5d0de653fe4a33d7465f0f67a9b171a501 (diff) | |
| download | meta-openembedded-contrib-ross/wip.tar.gz | |
nodejs: don't force cross-compilation in native buildsross/wip
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index 180e170a35..2c6db481c6 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -137,18 +137,22 @@ addtask create_v8_qemu_wrapper after do_configure before do_compile LDFLAGS:append:x86 = " -latomic" +CROSS_FLAGS = "--cross-compiling" +CROSS_FLAGS:class-native = "--no-cross-compiling" + # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --verbose --prefix=${prefix} --cross-compiling \ + python3 configure.py --verbose --prefix=${prefix} \ --shared-openssl \ --without-dtrace \ --without-etw \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ --libdir=${libdir} \ + ${CROSS_FLAGS} \ ${ARCHFLAGS} \ ${PACKAGECONFIG_CONFARGS} } |