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

Unified Diff: build/common.gypi

Issue 1472873004: Reland of Use sysroot by default for all linux builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | build/config/sysroot.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 5c2098b146e0919ad2449ed7656511ac06b1d65d..ff85b3fe9d864edbb3aebb2a266674f439d6f624 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -88,10 +88,11 @@
# Enable Wayland display server support.
'enable_wayland_server%' : 0,
- # Build against pre-built sysroot image on linux. By default
- # the sysroot image is only used for Official builds or when cross
- # compiling.
- 'use_sysroot%': 0,
+ # By default we build against a stable sysroot image to avoid
+ # depending on the packages installed on the local machine. Set this
+ # to 0 to build against locally installed headers and libraries (e.g.
+ # if packaging for a linux distro)
+ 'use_sysroot%': 1,
# Override buildtype to select the desired build flavor.
# Dev - everyday build for development/testing
@@ -294,8 +295,11 @@
'mips_arch_variant%': 'r1',
}],
- # The system root for cross-compiles. Default: none.
- ['OS=="linux" and chromeos==0 and ((branding=="Chrome" and buildtype=="Official") or target_arch=="arm" or target_arch=="mipsel" or use_sysroot==1)', {
+ # The system root for linux compiles.
+ # Not used when chromecast=1 since ozone_platform_gbm doesn't
+ # currently build against the linux sysroot
+ # TODO(sbc): http://crbug.com/559708
+ ['OS=="linux" and chromeos==0 and chromecast==0 and use_sysroot==1', {
# sysroot needs to be an absolute path otherwise it generates
# incorrect results when passed to pkg-config
'conditions': [
« no previous file with comments | « no previous file | build/config/sysroot.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698