diff --git a/build/common.gypi b/build/common.gypi
index 4e896e019a..34508913fe 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -184,6 +184,9 @@
           }],
         ],
       }],
+      ['OS=="solaris"', {
+        'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
+      }],
     ],
     'configurations': {
       'Debug': {
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 50144172a0..18b468449a 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -641,6 +641,13 @@
                 ],
               }
             ],
+            ['OS=="solaris"', {
+                'sources': [
+                  '../../src/platform-solaris.cc',
+                  '../../src/platform-posix.cc',
+                ],
+              }
+            ],
             ['OS=="mac"', {
               'sources': [
                 '../../src/platform-macos.cc',