From 578dc0b9b23a653c0bd2072daefadc786e49088d Mon Sep 17 00:00:00 2001 From: Roger Wang Date: Tue, 14 May 2024 14:38:41 -0600 Subject: [PATCH] Fix linux32 compiling --- deps/zlib/zlib.gyp | 4 ++-- node.gyp | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp index 1ec1ef5be7..366aa7abff 100644 --- a/deps/zlib/zlib.gyp +++ b/deps/zlib/zlib.gyp @@ -209,14 +209,14 @@ ], }], # Incorporate optimizations where possible. - ['(target_arch in "ia32 x64" and OS!="ios") or arm_fpu=="neon"', { + ['(target_arch in "x64" and OS!="ios") or arm_fpu=="neon"', { 'dependencies': [ 'zlib_inflate_chunk_simd' ], 'sources': [ '<(ZLIB_ROOT)/slide_hash_simd.h' ] }, { 'defines': [ 'CPU_NO_SIMD' ], 'sources': [ '<(ZLIB_ROOT)/inflate.c' ], }], - ['target_arch in "ia32 x64" and OS!="ios"', { + ['target_arch in "x64" and OS!="ios"', { 'dependencies': [ 'zlib_adler32_simd', # Disabled due to memory corruption. diff --git a/node.gyp b/node.gyp index 2371d780c1..828c342104 100644 --- a/node.gyp +++ b/node.gyp @@ -1583,13 +1583,6 @@ 'defines': ['NODE_JS2C_USE_STRING_LITERALS'], 'ldflags': [ '-lstdc++' ], }], - [ 'OS=="linux" and component != "shared_library"', { - 'ldflags': [ - '-Wl,--whole-archive', - '<(LIBCXX)', - '-Wl,--no-whole-archive' - ] - }], [ 'debug_node=="true"', { 'cflags!': [ '-O3' ], 'cflags': [ '-g', '-O0' ],