Merge pull request #10161 from electron/fix-cross-linux

Fix Linux ia32/arm build
This commit is contained in:
Cheng Zhao 2017-07-31 15:34:40 +09:00 committed by GitHub
commit 2d644a1560

View file

@ -203,12 +203,12 @@
'BasicRuntimeChecks': '3', # 3 = all checks enabled, 0 = off 'BasicRuntimeChecks': '3', # 3 = all checks enabled, 0 = off
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'OptimizeReferences': 2, # /OPT:REF 'OptimizeReferences': 2, # /OPT:REF
'EnableCOMDATFolding': 2, # /OPT:ICF 'EnableCOMDATFolding': 2, # /OPT:ICF
}, },
}, },
'conditions': [ 'conditions': [
['OS=="linux"', { ['OS=="linux" and target_arch=="x64"', {
'defines': [ 'defines': [
'_GLIBCXX_DEBUG', '_GLIBCXX_DEBUG',
], ],