Merge pull request grpc#3944 from murgatroid99/node_mac_build

Make the Node library build and run on Mac
tangjiaxi · Oct 23, 2015 · 850ffbc · 850ffbc
2 parents df5ac28 + 22c448b
commit 850ffbc
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -54,7 +54,8 @@
     ],
     'include_dirs': [
       '.',
-      'include'
+      'include',
+      '<(node_root_dir)/deps/openssl/openssl/include'
     ],
     'conditions': [
       ['OS != "win"', {
@@ -73,6 +74,15 @@
          ]
         ]
       }],
+      ["target_arch=='ia32'", {
+          "include_dirs": [ "<(node_root_dir)/deps/openssl/config/piii" ]
+      }],
+      ["target_arch=='x64'", {
+          "include_dirs": [ "<(node_root_dir)/deps/openssl/config/k8" ]
+      }],
+      ["target_arch=='arm'", {
+          "include_dirs": [ "<(node_root_dir)/deps/openssl/config/arm" ]
+      }]
     ]
   },
   'targets': [
@@ -124,6 +134,13 @@
         'src/core/support/time_win32.c',
         'src/core/support/tls_pthread.c',
       ],
+      "conditions": [
+        ['OS == "mac"', {
+          'xcode_settings': {
+            'MACOSX_DEPLOYMENT_TARGET': '10.9'
+          }
+        }]
+      ],
     },
     {
       'target_name': 'grpc',
@@ -282,6 +299,13 @@
         'src/core/census/operation.c',
         'src/core/census/tracing.c',
       ],
+      "conditions": [
+        ['OS == "mac"', {
+          'xcode_settings': {
+            'MACOSX_DEPLOYMENT_TARGET': '10.9'
+          }
+        }]
+      ],
     },
     {
       'include_dirs': [

diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template
@@ -56,7 +56,8 @@
       ],
       'include_dirs': [
         '.',
-        'include'
+        'include',
+        '<(node_root_dir)/deps/openssl/openssl/include'
       ],
       'conditions': [
         ['OS != "win"', {
@@ -75,6 +76,15 @@
            ]
           ]
         }],
+        ["target_arch=='ia32'", {
+            "include_dirs": [ "<(node_root_dir)/deps/openssl/config/piii" ]
+        }],
+        ["target_arch=='x64'", {
+            "include_dirs": [ "<(node_root_dir)/deps/openssl/config/k8" ]
+        }],
+        ["target_arch=='arm'", {
+            "include_dirs": [ "<(node_root_dir)/deps/openssl/config/arm" ]
+        }]
       ]
     },
     'targets': [
@@ -94,6 +104,13 @@
           '${source}',
           % endfor
         ],
+        "conditions": [
+          ['OS == "mac"', {
+            'xcode_settings': {
+              'MACOSX_DEPLOYMENT_TARGET': '10.9'
+            }
+          }]
+        ],
       },
       % endif
       % endfor