bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix pkg-config execution with custom sysroot (issue #1804)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-01-08 11:50:17 -08:00
parent ff8c5a6caa
commit c1efd5b5be
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cef.gyp
View File

@@ -4,7 +4,6 @@
{ {
'variables': { 'variables': {
'pkg-config': 'pkg-config',
'chromium_code': 1, 'chromium_code': 1,
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cef', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cef',
'framework_name': 'Chromium Embedded Framework', 'framework_name': 'Chromium Embedded Framework',
@@ -1949,15 +1948,15 @@
}, },
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
'<!@(pkg-config --cflags <(gtk_packages))', '<!@(<(pkg-config) --cflags <(gtk_packages))',
], ],
}, },
'link_settings': { 'link_settings': {
'ldflags': [ 'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages))', '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packages))',
], ],
'libraries': [ 'libraries': [
'<!@(pkg-config --libs-only-l <(gtk_packages))', '<!@(<(pkg-config) --libs-only-l <(gtk_packages))',
], ],
}, },
}, },
@@ -1970,15 +1969,15 @@
}, },
'direct_dependent_settings': { 'direct_dependent_settings': {
'cflags': [ 'cflags': [
'<!@(pkg-config --cflags <(gtk_packages))', '<!@(<(pkg-config) --cflags <(gtk_packages))',
], ],
}, },
'link_settings': { 'link_settings': {
'ldflags': [ 'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages))', '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packages))',
], ],
'libraries': [ 'libraries': [
'<!@(pkg-config --libs-only-l <(gtk_packages))', '<!@(<(pkg-config) --libs-only-l <(gtk_packages))',
], ],
}, },
}, },