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

Side by Side Diff: build/config/linux/pkg_config.gni

Issue 1556923002: clang: Makes builds with clang less dependent on absolute file path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch to "//." Created 4 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 unified diff | Download patch
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/sysroot.gni") 5 import("//build/config/sysroot.gni")
6 6
7 # Defines a config specifying the result of running pkg-config for the given 7 # Defines a config specifying the result of running pkg-config for the given
8 # packages. Put the package names you want to query in the "packages" variable 8 # packages. Put the package names you want to query in the "packages" variable
9 # inside the template invocation. 9 # inside the template invocation.
10 # 10 #
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 pkg_config_script = "//build/config/linux/pkg-config.py" 36 pkg_config_script = "//build/config/linux/pkg-config.py"
37 37
38 # Define the args we pass to the pkg-config script for other build files that 38 # Define the args we pass to the pkg-config script for other build files that
39 # need to invoke it manually. 39 # need to invoke it manually.
40 if (sysroot != "") { 40 if (sysroot != "") {
41 # Pass the sysroot if we're using one (it requires the CPU arch also). 41 # Pass the sysroot if we're using one (it requires the CPU arch also).
42 pkg_config_args = [ 42 pkg_config_args = [
43 "-s", 43 "-s",
44 sysroot, 44 rebase_path(sysroot, "", ".."),
brettw 2016/01/06 18:15:07 Wait, I don't understand this line. Why the ".."?
Zachary Forman 2016/01/06 23:20:49 Without the .., you get output like "-I../../build
brettw 2016/01/07 19:22:22 Semantically I don't think this line makes sense,
Zachary Forman 2016/01/07 22:54:27 I don't think this is the case. To start with,the
45 "-a", 45 "-a",
46 current_cpu, 46 current_cpu,
47 ] 47 ]
48 } else if (pkg_config != "") { 48 } else if (pkg_config != "") {
49 pkg_config_args = [ 49 pkg_config_args = [
50 "-p", 50 "-p",
51 pkg_config, 51 pkg_config,
52 ] 52 ]
53 } else { 53 } else {
54 pkg_config_args = [] 54 pkg_config_args = []
(...skipping 18 matching lines...) Expand all
73 ldflags = pkgresult[4] 73 ldflags = pkgresult[4]
74 } 74 }
75 75
76 forward_variables_from(invoker, 76 forward_variables_from(invoker,
77 [ 77 [
78 "defines", 78 "defines",
79 "visibility", 79 "visibility",
80 ]) 80 ])
81 } 81 }
82 } 82 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698