Skip to content

Fix macOS and Windows Electron 4 builds #1626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
implausible merged 1 commit into from
Feb 11, 2019
Merged

Fix macOS and Windows Electron 4 builds #1626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions generate/templates/templates/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
[
"OS=='mac'", {
"conditions": [
["node_root_dir.split('/')[-1].startswith('iojs')", {
["<(is_electron) == 1", {
"include_dirs": [
"vendor/openssl/include"
],
Expand Down Expand Up @@ -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",
Expand Down
9 changes: 5 additions & 4 deletions vendor/libgit2.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -299,7 +300,7 @@
"conditions": [
["OS=='mac'", {
"conditions": [
["node_root_dir.split('/')[-1].startswith('iojs')", {
["<(is_electron) == 1", {
"include_dirs": [
"openssl/include"
]
Expand Down Expand Up @@ -370,7 +371,7 @@
],
},
}],
["node_root_dir.split('\\\\')[-1].startswith('iojs')", {
["<(is_electron) == 1", {
"include_dirs": ["openssl/include"]
}]
],
Expand Down Expand Up @@ -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"
],
Expand Down