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

Unified Diff: build/linux/system.gyp

Issue 60070: Fix linking with gold by cleaning up lib dependencies. (Closed)
Patch Set: Created 11 years, 9 months 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 | chrome/chrome.gyp » ('j') | 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 73f439a0abcfded841deaa60a2223694bf8cb01b..0c6b7ed27e8c543f6544ef7fee8d729d4636c770 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -33,16 +33,44 @@
},
},
{
- 'target_name': 'pangoft2',
+ 'target_name': 'freetype2',
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags pangoft2)',
+ '<!@(python pkg_config_wrapper.py --cflags freetype2)',
],
},
'link_settings': {
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs pangoft2)',
+ '<!@(python pkg_config_wrapper.py --libs freetype2)',
+ ],
+ },
+ },
+ {
+ 'target_name': 'fontconfig',
+ 'type': 'settings',
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(python pkg_config_wrapper.py --cflags fontconfig)',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '<!@(python pkg_config_wrapper.py --libs fontconfig)',
+ ],
+ },
+ },
+ {
+ 'target_name': 'gdk',
+ 'type': 'settings',
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(python pkg_config_wrapper.py --cflags gdk-2.0)',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '<!@(python pkg_config_wrapper.py --libs gdk-2.0)',
],
},
},
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698