Skip to content

Commit bc66ff0

Browse files
committed
fixup! Fix gyps for common.gypi removal in chromium repo
1 parent 8bc1d14 commit bc66ff0

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

common.gypi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
}, {
4646
'os_posix': 1,
4747
'v8_postmortem_support%': 'true',
48+
'clang_dir': '<!(cd <(DEPTH) && pwd -P)/third_party/llvm-build/Release+Asserts',
4849
}],
4950
['GENERATOR == "ninja" or OS== "mac"', {
5051
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
@@ -66,6 +67,16 @@
6667
],
6768
},
6869

70+
'conditions': [
71+
[ 'clang==1 and OS != "mac"', {
72+
'make_global_settings': [
73+
['CC', '<(clang_dir)/bin/clang'],
74+
['CXX', '<(clang_dir)/bin/clang++'],
75+
['CC.host', '$(CC)'],
76+
['CXX.host', '$(CXX)'],
77+
],
78+
}],
79+
],
6980
'target_defaults': {
7081
'default_configuration': 'Release',
7182
'variables': {
@@ -157,6 +168,7 @@
157168
],
158169
},
159170
'Debug_Base': {
171+
'abstract': 1,
160172
'variables': {
161173
'v8_enable_handle_zapping': 1,
162174
},
@@ -192,6 +204,7 @@
192204
},
193205
},
194206
'Release_Base': {
207+
'abstract': 1,
195208
'variables': {
196209
'v8_enable_handle_zapping': 0,
197210
},

0 commit comments

Comments
 (0)