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

Unified Diff: build/config/linux/pkg-config.py

Issue 1530723002: GN: Don't default to using lib64 in PKG_CONFIG_PATH (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. 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/linux/pkg-config-wrapper » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/linux/pkg-config.py
diff --git a/build/config/linux/pkg-config.py b/build/config/linux/pkg-config.py
index 3ebc13d145199f5509c2758433c0668e3b27c971..b0381583c2cad6b0a411da1ed52bc2a24ddf7d73 100644
--- a/build/config/linux/pkg-config.py
+++ b/build/config/linux/pkg-config.py
@@ -52,10 +52,11 @@ def SetConfigPath(options):
if sysroot and not arch:
print "You must specify an architecture via -a if using a sysroot."
sys.exit(1)
- if arch == 'x64':
- libpath = 'lib64'
- else:
- libpath = 'lib'
+
+ # In the gyp world this is configurable via the 'system_libdir' variable,
+ # which doesn't seem to have an equivelent in gn yet.
+ # TOOD(sbc): Make this configurable like it is under gyp.
+ libpath = 'lib'
# Add the sysroot path to the environment's PKG_CONFIG_PATH
config_path = sysroot + '/usr/' + libpath + '/pkgconfig'
« no previous file with comments | « no previous file | build/linux/pkg-config-wrapper » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698