diff --git a/common.gypi b/common.gypi
index 9ecfc4d2a3..abe46bed46 100644
--- a/common.gypi
+++ b/common.gypi
@@ -79,10 +79,12 @@
             ],
           }],
           ['OS=="solaris"', {
-            'cflags': [ '-fno-omit-frame-pointer' ],
             # pull in V8's postmortem metadata
             'ldflags': [ '-Wl,-z,allextract' ]
           }],
+          ['OS!="mac" and OS!="win"', {
+            'cflags': [ '-fno-omit-frame-pointer' ],
+          }],
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
diff --git a/node.gyp b/node.gyp
index 89aa36f317..3a1b8c9cd8 100644
--- a/node.gyp
+++ b/node.gyp
@@ -290,6 +290,12 @@
             'PLATFORM="sunos"',
           ],
         }],
+        [
+          'OS=="linux"', {
+            'ldflags': [
+              '-Wl,--whole-archive <(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a -Wl,--no-whole-archive',
+            ],
+        }],
       ],
       'msvs_settings': {
         'VCLinkerTool': {