github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when cross compilation

Browse Source
This commit is contained in:
Cheng Zhao
2018-01-31 17:13:59 +09:00
parent b25175a19a
commit 81c23b84e7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.gypi
View File

@@ -245,7 +245,7 @@
}], # OS=="win"
],
}],
['OS=="linux" and _target_name in ["dump_syms", "node"]', {
['OS=="linux" and _toolset=="target" and _target_name in ["dump_syms", "node"]', {
'conditions': [
['libchromiumcontent_component==0', {
'libraries': [

7
toolchain.gypi
View File

@@ -129,7 +129,7 @@
'OTHER_LDFLAGS': [ '-stdlib=libc++' ],
},
}],
['OS=="linux"', {
['OS=="linux" and _toolset=="target"', {
'cflags_cc': [
'-std=gnu++14',
'-nostdinc++',
@@ -140,6 +140,11 @@
'-nostdlib++',
],
}],
['OS=="linux" and _toolset=="host"', {
'cflags_cc': [
'-std=gnu++14',
],
}],
],
},
}], # clang==1