mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.gypi
View file

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

7
toolchain.gypi
View file

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