Merge pull request #1626 from ianhattendorf/fix/electron-4-build

implausible · web-flow · commit 08452f89c976 · 2019-02-11T10:50:37.000-07:00
Fix macOS and Windows Electron 4 builds
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -94,7 +94,7 @@
         [
           "OS=='mac'", {
             "conditions": [
-              ["node_root_dir.split('/')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": [
                   "vendor/openssl/include"
                 ],
@@ -122,7 +122,7 @@
         [
           "OS=='win'", {
             "conditions": [
-              ["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": ["vendor/openssl/include"],
                 "libraries": [
                   "<(module_root_dir)/vendor/openssl/lib/libcrypto.lib",
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -7,6 +7,7 @@
     "library%": "static_library",
     "openssl_enable_asm%": 0, # only supported with the Visual Studio 2012 (VC11) toolchain.
     "gcc_version%": 0,
+    "is_electron%": "<!(node ../utils/isBuildingForElectron.js <(node_root_dir))",
     "is_clang%": 0
   },
   "targets": [
@@ -299,7 +300,7 @@
       "conditions": [
         ["OS=='mac'", {
             "conditions": [
-              ["node_root_dir.split('/')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": [
                   "openssl/include"
                 ]
@@ -370,7 +371,7 @@
                   ],
                 },
               }],
-              ["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
+              ["<(is_electron) == 1", {
                 "include_dirs": ["openssl/include"]
               }]
             ],
@@ -545,14 +546,14 @@
         ]
       },
       "conditions": [
-        ["OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs')", {
+        ["OS=='mac' and <(is_electron) == 1", {
           "include_dirs": [
             "openssl/include",
           ]
         }],
         ["OS=='win'", {
           "conditions": [
-            ["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
+            ["<(is_electron) == 1", {
               "include_dirs": [
                 "openssl/include"
               ],
