Chromium Code Reviews

Side by Side Diff: build/config/linux/BUILD.gn

Issue 1536423003: gn: Pass pkg_config_args when invoking pkg_config_script. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « no previous file | ui/accessibility/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/linux/pkg_config.gni") 5 import("//build/config/linux/pkg_config.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/sysroot.gni") 7 import("//build/config/sysroot.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 9
10 # This is included by reference in the //build/config/compiler config that 10 # This is included by reference in the //build/config/compiler config that
(...skipping 105 matching lines...)
116 116
117 # CrOS doesn't install GTK, gconf or any gnome packages. 117 # CrOS doesn't install GTK, gconf or any gnome packages.
118 if (!is_chromeos && use_gconf) { 118 if (!is_chromeos && use_gconf) {
119 # These packages should _only_ be expected when building for a target. 119 # These packages should _only_ be expected when building for a target.
120 # If these extra checks are not run, gconf is required when building host 120 # If these extra checks are not run, gconf is required when building host
121 # tools for a CrOS build. 121 # tools for a CrOS build.
122 if (current_toolchain == default_toolchain) { 122 if (current_toolchain == default_toolchain) {
123 pkg_config("atk") { 123 pkg_config("atk") {
124 packages = [ "atk" ] 124 packages = [ "atk" ]
125 atk_lib_dir = exec_script(pkg_config_script, 125 atk_lib_dir = exec_script(pkg_config_script,
126 [ 126 pkg_config_args + [
127 "--libdir", 127 "--libdir",
128 "atk", 128 "atk",
129 ], 129 ],
130 "string") 130 "string")
131 defines = [ "ATK_LIB_DIR=\"$atk_lib_dir\"" ] 131 defines = [ "ATK_LIB_DIR=\"$atk_lib_dir\"" ]
132 } 132 }
133 133
134 # gn orders flags on a target before flags from configs. The default config 134 # gn orders flags on a target before flags from configs. The default config
135 # adds -Wall, and these flags have to be after -Wall -- so they need to 135 # adds -Wall, and these flags have to be after -Wall -- so they need to
136 # come from a config and can't be on the target directly. 136 # come from a config and can't be on the target directly.
137 config("atk_warnings") { 137 config("atk_warnings") {
138 cflags = [ 138 cflags = [
139 # glib uses the pre-c++11 typedef-as-static_assert hack. 139 # glib uses the pre-c++11 typedef-as-static_assert hack.
140 "-Wno-unused-local-typedef", 140 "-Wno-unused-local-typedef",
141 141
142 # G_DEFINE_TYPE automatically generates a *get_instance_private 142 # G_DEFINE_TYPE automatically generates a *get_instance_private
143 # inline function after glib 2.37. That's unused. Prevent to 143 # inline function after glib 2.37. That's unused. Prevent to
144 # complain about it. 144 # complain about it.
145 "-Wno-unused-function", 145 "-Wno-unused-function",
146 ] 146 ]
147 } 147 }
148 148
149 pkg_config("gconf") { 149 pkg_config("gconf") {
150 packages = [ "gconf-2.0" ] 150 packages = [ "gconf-2.0" ]
151 defines = [ "USE_GCONF" ] 151 defines = [ "USE_GCONF" ]
152 } 152 }
153 } 153 }
154 } 154 }
OLDNEW
« no previous file with comments | « no previous file | ui/accessibility/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine