diff options
| -rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 4 |
1 files changed, 2 insertions, 2 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 f8b7f76f61..a667d3bd3f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | |||
| @@ -140,9 +140,10 @@ LDFLAGS:append:x86 = " -latomic" | |||
| 140 | CROSS_FLAGS = "--cross-compiling" | 140 | CROSS_FLAGS = "--cross-compiling" |
| 141 | CROSS_FLAGS:class-native = "--no-cross-compiling" | 141 | CROSS_FLAGS:class-native = "--no-cross-compiling" |
| 142 | 142 | ||
| 143 | #export LD="${CXX}" | ||
| 144 | |||
| 143 | # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi | 145 | # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi |
| 144 | do_configure () { | 146 | do_configure () { |
| 145 | export LD="${CXX}" | ||
| 146 | GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES | 147 | GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES |
| 147 | # $TARGET_ARCH settings don't match --dest-cpu settings | 148 | # $TARGET_ARCH settings don't match --dest-cpu settings |
| 148 | python3 configure.py --verbose --prefix=${prefix} \ | 149 | python3 configure.py --verbose --prefix=${prefix} \ |
| @@ -158,7 +159,6 @@ do_configure () { | |||
| 158 | } | 159 | } |
| 159 | 160 | ||
| 160 | do_compile () { | 161 | do_compile () { |
| 161 | export LD="${CXX}" | ||
| 162 | install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/openssl/nodejs-openssl.cnf | 162 | install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/openssl/nodejs-openssl.cnf |
| 163 | install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh | 163 | install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh |
| 164 | oe_runmake BUILDTYPE=Release | 164 | oe_runmake BUILDTYPE=Release |
