Index: build/standalone.gypi |
diff --git a/build/standalone.gypi b/build/standalone.gypi |
index f2162b0a12eb01308c10987f489b22f7a4d204c3..4c662d593b2c56c1455f59f6ff63dff0cd8346c6 100644 |
--- a/build/standalone.gypi |
+++ b/build/standalone.gypi |
@@ -730,6 +730,9 @@ |
'SYMROOT': '<(DEPTH)/xcodebuild', |
}, |
'target_defaults': { |
+ 'variables': { |
+ 'base_path%': '<!(cd <(DEPTH) && pwd -P)', # Mac requires full path. |
+ }, |
'xcode_settings': { |
'ALWAYS_SEARCH_USER_PATHS': 'NO', |
'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99 |
@@ -768,8 +771,11 @@ |
}], |
['clang==1', { |
'xcode_settings': { |
+ 'CC': '<(base_path)/<(clang_dir)/bin/clang', |
+ 'LDPLUSPLUS': '<(base_path)/<(clang_dir)/bin/clang++', |
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', |
'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x |
+ 'CLANG_CXX_LIBRARY': 'libc++' |
Jakob Kummerow
2015/06/29 09:58:48
nit: trailing comma for consistency
balazs.kilvady
2015/06/29 11:55:46
Done.
|
}, |
}], |
], |