Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Unified Diff: build/toolchain/clang.gni

Issue 239543013: Work on Mac GN build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix line endings Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/toolchain/clang.gni
diff --git a/build/toolchain/clang.gni b/build/toolchain/clang.gni
index 861a681363e7af7847de2c7d6ac2a952b8d67aee..c6803844d8b22340f75ccba87851635ad9ddedc1 100644
--- a/build/toolchain/clang.gni
+++ b/build/toolchain/clang.gni
@@ -7,30 +7,3 @@ declare_args() {
# with the allocation type.
use_clang_type_profiler = false
}
-
-if (is_clang) {
- # Define "make_clang_dir" which is the directory relative to the source root
- # of the clang directory we're using. This is used for defining the header
- # for GYP so it must match the directory format of GYP (rather than using
- # GN-style "//..." paths).
- if (is_linux && use_clang_type_profiler) {
- if (cpu_arch == "x64") {
- make_clang_dir = "third_party/llvm-allocated-type/Linux_x64"
- } else {
- # 32-bit Clang is unsupported. It may not build. Put your 32-bit Clang in
- # this directory at your own risk if needed for some purpose (e.g. to
- # compare 32-bit and 64-bit behavior like memory usage). Any failure by
- # this compiler should not close the tree.
- make_clang_dir = "third_party/llvm-allocated-type/Linux_ia32"
- }
- } else {
- make_clang_dir = "third_party/llvm-build/Release+Asserts"
- }
-
- # This includes the array values but not the 'make_global_settings' name.
- make_clang_global_settings =
- "['CC', '$make_clang_dir/bin/clang']," +
- "['CXX', '$make_clang_dir/bin/clang++']," +
- "['CC.host', '\$(CC)']," +
- "['CXX.host', '\$(CXX)'],"
-}
« no previous file with comments | « build/toolchain/android/BUILD.gn ('k') | build/toolchain/linux/BUILD.gn » ('j') | skia/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698