summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--DEPS9
-rw-r--r--build/standalone.gypi36
3 files changed, 1 insertions, 47 deletions
diff --git a/.gitignore b/.gitignore
index cbd1e7da4e..3014ed6fa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,6 @@
/testing/corpus
/testing/gmock
/testing/gtest
-/third_party/llvm
-/third_party/llvm-build
-/tools/clang
/v8
/xcodebuild
Makefile
diff --git a/DEPS b/DEPS
index 8f0b55f29c..74097a67d9 100644
--- a/DEPS
+++ b/DEPS
@@ -16,9 +16,6 @@ deps = {
"testing/gtest":
"https://chromium.googlesource.com/external/googletest.git@8245545b6dc9c4703e6496d1efd19e975ad2b038",
- "tools/clang":
- "https://chromium.googlesource.com/chromium/src/tools/clang",
-
"v8":
"https://chromium.googlesource.com/v8/v8.git@d3f97a972ffe37989fed2794d07e33f7c25f651c",
@@ -79,10 +76,4 @@ hooks = [
'-s', 'buildtools/linux64/clang-format.sha1',
],
},
- {
- # Pull clang if needed or requested via GYP_DEFINES.
- 'name': 'clang',
- 'pattern': '.',
- 'action': ['python', 'tools/clang/scripts/update.py', '--if-needed'],
- },
]
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"
- ],
+ }
}