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

Unified Diff: build/config/sysroot.gni

Issue 116763005: GN: Get Mac build working for IPC target at least. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Brett's comments. Created 6 years, 11 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
« no previous file with comments | « build/config/mac/mac_sdk.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/sysroot.gni
diff --git a/build/config/linux/sysroot.gni b/build/config/sysroot.gni
similarity index 70%
rename from build/config/linux/sysroot.gni
rename to build/config/sysroot.gni
index 4d14915ecdebb6d8c3c7856199b9ea28647cffe0..ce1c5f2b7c6bba4ad6d38f94aa89907fcff9aa64 100644
--- a/build/config/linux/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -5,8 +5,8 @@
# This header file defines the "sysroot" variable which is the absolute path
# of the sysroot. If no sysroot applies, the variable will be an empty string.
-# For official builds, use the sysroot checked into the internal source repo so
-# that the builds work on older versions of Linux.
+# For official linux builds, use the sysroot checked into the internal source
+# repo so that the builds work on older versions of Linux.
if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {
if (cpu_arch == "x64") {
sysroot = rebase_path(
@@ -19,9 +19,9 @@ if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {
sysroot = ""
}
} else if (is_mac) {
- # Set which SDK to use.
- # TODO(brettw) this needs to be configurable somehow.
- sysroot = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
+ import("//build/config/mac/mac_sdk.gni")
+
+ sysroot = mac_sdk_path
} else {
sysroot = ""
}
« no previous file with comments | « build/config/mac/mac_sdk.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698