Fix linux32 compiling

nwjs · May 14, 2024 · 578dc0b · 578dc0b
1 parent 75b538d
commit 578dc0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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' ],