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

Unified Diff: build/linux/system.gyp

Issue 1529883004: gyp: always use pkg-config wrapper (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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 2c346298722804197d4c93bd59627729505556ad..fe6bf8c318027d91d7ea1967f0569581ba02b474 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -154,15 +154,15 @@
}, {
'all_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags <(gtk_packages))',
+ '<!@(<(pkg-config) --cflags <(gtk_packages))',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages))',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packages))',
],
'libraries': [
- '<!@(pkg-config --libs-only-l <(gtk_packages))',
+ '<!@(<(pkg-config) --libs-only-l <(gtk_packages))',
],
},
}],
@@ -216,15 +216,15 @@
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags x11)',
+ '<!@(<(pkg-config) --cflags x11)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
],
'libraries': [
- '<!@(pkg-config --libs-only-l x11 xi)',
+ '<!@(<(pkg-config) --libs-only-l x11 xi)',
],
},
}],
@@ -354,15 +354,15 @@
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags xrandr)',
+ '<!@(<(pkg-config) --cflags xrandr)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)',
],
'libraries': [
- '<!@(pkg-config --libs-only-l xrandr)',
+ '<!@(<(pkg-config) --libs-only-l xrandr)',
],
},
}],
@@ -407,15 +407,15 @@
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags xtst)',
+ '<!@(<(pkg-config) --cflags xtst)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other xtst)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
],
'libraries': [
- '<!@(pkg-config --libs-only-l xtst)',
+ '<!@(<(pkg-config) --libs-only-l xtst)',
],
},
}]
@@ -454,15 +454,15 @@
}, {
'all_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags <(gtk_packages))',
+ '<!@(<(pkg-config) --cflags <(gtk_packages))',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages))',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packages))',
],
'libraries': [
- '<!@(pkg-config --libs-only-l <(gtk_packages))',
+ '<!@(<(pkg-config) --libs-only-l <(gtk_packages))',
],
},
}],
@@ -931,15 +931,15 @@
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags <(glib_packages))',
+ '<!@(<(pkg-config) --cflags <(glib_packages))',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other <(glib_packages))',
],
'libraries': [
- '<!@(pkg-config --libs-only-l <(glib_packages))',
+ '<!@(<(pkg-config) --libs-only-l <(glib_packages))',
],
},
}],
@@ -1197,15 +1197,15 @@
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags pangocairo pangoft2)',
+ '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
],
'libraries': [
- '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
+ '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
],
},
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698