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

Unified Diff: build/config/linux/BUILD.gn

Issue 699263002: Try to resuscitate the builds needed to do official GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix package exclusion for gconf Created 6 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 | ui/display/BUILD.gn » ('j') | ui/display/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/linux/BUILD.gn
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
index 98d131e800006d6da7cec92fda4075ac81043f84..758f42a6164a935143689fb215835fe9a2e8ad27 100644
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -118,8 +118,7 @@ if (!is_chromeos) {
# These packages should _only_ be expected when building for a target.
# If these extra checks are not run, gconf is required when building host
# tools for a CrOS build.
- if (current_toolchain == host_toolchain &&
- host_toolchain == default_toolchain) {
+ if (current_toolchain == default_toolchain) {
Chris Masone 2014/11/04 23:33:16 So, gconf is required only when compiling _target_
brettw 2014/11/04 23:47:52 This is necessary for the 32-bit cross-compile, wh
Chris Masone 2014/11/05 00:53:31 I definitely tried this first, and it didn't work
pkg_config("gconf") {
packages = [ "gconf-2.0" ]
defines = [ "USE_GCONF" ]
« no previous file with comments | « no previous file | ui/display/BUILD.gn » ('j') | ui/display/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698