Skip to content

A
angle
Commit 31aabdfb by Sam Clegg Committed by Jamie Madill
Options

gyp: Always use pkg-config wrapper

Calling pkg-config directly doesn't work when building with a sysroot image as it will looks for host libraries rather than those within the sysroot. BUG=chromium:569947 Change-Id: I6f3e63c1816cd9393110cb3060744a69a93c9a2e Reviewed-on: https://chromium-review.googlesource.com/318771Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Tryjob-Request: Corentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarSam Clegg <sbc@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 967cb3b2
Showing with 13 additions and 6 deletions
build/standalone.gypi
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
# standalone ANGLE on Chrome OS. # standalone ANGLE on Chrome OS.
'chromeos': 0, 'chromeos': 0,
# Chromium puts the pkg-config command in a variable because
# calling pkg-config directly doesn't work in a sysroot image.
# See Chromium bug 569947 for more information.
# For standalone builds we don't have this problem so we use
# the regular command.
'pkg-config': 'pkg-config',
# Use a nested variable trick to get use_x11 evaluated more # Use a nested variable trick to get use_x11 evaluated more
# eagerly than other conditional variables. # eagerly than other conditional variables.
'variables': 'variables':
......
src/libGLESv2.gypi
...@@ -735,10 +735,10 @@ ...@@ -735,10 +735,10 @@
], ],
'link_settings': { 'link_settings': {
'ldflags': [ 'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
], ],
'libraries': [ 'libraries': [
'<!@(pkg-config --libs-only-l x11 xi) -ldl', '<!@(<(pkg-config) --libs-only-l x11 xi) -ldl',
], ],
}, },
}], }],
......
src/tests/deqp.gypi
...@@ -1540,11 +1540,11 @@ ...@@ -1540,11 +1540,11 @@
{ {
'ldflags': 'ldflags':
[ [
'<!@(pkg-config --libs-only-L --libs-only-other libpci)', '<!@(<(pkg-config) --libs-only-L --libs-only-other libpci)',
], ],
'libraries': 'libraries':
[ [
'<!@(pkg-config --libs-only-l libpci)', '<!@(<(pkg-config) --libs-only-l libpci)',
], ],
}], }],
['OS=="mac"', ['OS=="mac"',
......
util/util.gyp
...@@ -154,11 +154,11 @@ ...@@ -154,11 +154,11 @@
{ {
'ldflags': 'ldflags':
[ [
'<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
], ],
'libraries': 'libraries':
[ [
'<!@(pkg-config --libs-only-l x11 xi) -lrt', '<!@(<(pkg-config) --libs-only-l x11 xi) -lrt',
], ],
}, },
}], }],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment