summaryrefslogtreecommitdiff
path: root/build/standalone.gypi
diff options
context:
space:
mode:
authorOliver Chang <ochang@chromium.org>2015-10-19 11:23:52 -0700
committerOliver Chang <ochang@chromium.org>2015-10-19 11:23:52 -0700
commitdb1eaae6aad2ab0ca775919bc53ee7f5e3fc67fb (patch)
treed0da57af48d88a18e0cd7dca9093057316da4078 /build/standalone.gypi
parent5478df43a8970257e9644ae6f57a6fe7513029c6 (diff)
downloadpdfium-db1eaae6aad2ab0ca775919bc53ee7f5e3fc67fb.tar.xz
Revert "Switch builds to clang by default for Linux and OS X."
This reverts commit 5478df43a8970257e9644ae6f57a6fe7513029c6. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1413193002 .
Diffstat (limited to 'build/standalone.gypi')
-rw-r--r--build/standalone.gypi36
1 files changed, 1 insertions, 35 deletions
diff --git a/build/standalone.gypi b/build/standalone.gypi
index a70b442bee..507368dc25 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -8,8 +8,6 @@
'variables': {
'component%': 'static_library',
'clang%': 0,
- 'asan%': 0,
- 'sanitizer_coverage%': 0,
'msvs_multi_core_compile%': '1',
'variables': {
'variables': {
@@ -39,7 +37,6 @@
'host_arch%': '<(host_arch)',
'target_arch%': '<(target_arch)',
},
- 'clang_dir%': 'third_party/llvm-build/Release+Asserts',
# These two are needed by V8.
'host_arch%': '<(host_arch)',
'target_arch%': '<(target_arch)',
@@ -53,11 +50,6 @@
}, {
'os_posix%': 1,
}],
- ['OS=="linux" or OS=="mac"', {
- 'clang%': 1,
- }, {
- 'clang%': 0,
- }],
],
},
'target_defaults': {
@@ -257,20 +249,6 @@
'-fPIC',
],
}],
- ['asan==1', {
- 'cflags': [
- '-fsanitize=address',
- '-gline-tables-only',
- ],
- 'ldflags': [
- '-fsanitize=address',
- ],
- }],
- ['sanitizer_coverage!=0', {
- 'cflags': [
- '-fsanitize-coverage=<(sanitizer_coverage)',
- ],
- }],
['OS=="win"', {
'defines': [
'NOMINMAX',
@@ -302,17 +280,5 @@
'xcode_settings': {
# See comment in Chromium's common.gypi for why this is needed.
'SYMROOT': '<(DEPTH)/xcodebuild',
- },
- 'conditions': [
- ['OS=="linux" or OS=="mac"', {
- 'conditions': [
- ['clang==1', {
- 'make_global_settings': [
- ['CC', '<(clang_dir)/bin/clang'],
- ['CXX', '<(clang_dir)/bin/clang++'],
- ],
- }],
- ],
- }], # OS=="linux" or OS=="mac"
- ],
+ }
}