Skip to content

Commit

Permalink
fixup! Fix gyps for common.gypi removal in chromium repo
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerwang committed Oct 27, 2016
1 parent 65d0b22 commit 55f81f3
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
}, {
'os_posix': 1,
'v8_postmortem_support%': 'true',
'clang_dir': '<!(cd <(DEPTH) && pwd -P)/third_party/llvm-build/Release+Asserts',
}],
['GENERATOR == "ninja" or OS== "mac"', {
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
Expand All @@ -66,6 +67,16 @@
],
},

'conditions': [
[ 'clang==1 and OS != "mac"', {
'make_global_settings': [
['CC', '<(clang_dir)/bin/clang'],
['CXX', '<(clang_dir)/bin/clang++'],
['CC.host', '$(CC)'],
['CXX.host', '$(CXX)'],
],
}],
],
'target_defaults': {
'default_configuration': 'Release',
'variables': {
Expand Down Expand Up @@ -157,6 +168,7 @@
],
},
'Debug_Base': {
'abstract': 1,
'variables': {
'v8_enable_handle_zapping': 1,
},
Expand Down Expand Up @@ -192,6 +204,7 @@
},
},
'Release_Base': {
'abstract': 1,
'variables': {
'v8_enable_handle_zapping': 0,
},
Expand Down

0 comments on commit 55f81f3

Please sign in to comment.