gn: leave PKG_CONFIG_PATH untouched when not using a sysroot
This makes cross-compilation possible when not using a sysroot. Review URL: https://codereview.chromium.org/1543483002 Cr-Original-Commit-Position: refs/heads/master@{#367906} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: c61271cf022bfb412db3e53ce8bbc5d8c2c1a873
This commit is contained in:
Родитель
3b6fac037b
Коммит
61e093bf8a
|
@ -44,8 +44,7 @@ def SetConfigPath(options):
|
|||
options on the given command line."""
|
||||
|
||||
sysroot = options.sysroot
|
||||
if not sysroot:
|
||||
sysroot = ""
|
||||
assert sysroot
|
||||
|
||||
# Compute the library path name based on the architecture.
|
||||
arch = options.arch
|
||||
|
@ -122,8 +121,8 @@ if options.strip_out != None:
|
|||
for regexp in options.strip_out:
|
||||
strip_out.append(re.compile(regexp))
|
||||
|
||||
SetConfigPath(options)
|
||||
if options.sysroot:
|
||||
SetConfigPath(options)
|
||||
prefix = GetPkgConfigPrefixToStrip(args)
|
||||
else:
|
||||
prefix = ''
|
||||
|
|
Загрузка…
Ссылка в новой задаче