From a6cf87ec511a64fc29c0bda5cf83ec282d34be59 Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 3 Apr 2009 04:07:38 +0000
Subject: Separate the pkg-config --libs output into --libs-only-l for
 'libraries' and --libs-{other,only-L} for 'ldflags'. Updates one spot in
 common.gypi where we were using 'linkflags'. Review URL:
 http://codereview.chromium.org/56188

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13067 0039d316-1c4b-4281-b951-d872f2087c98
---
 DEPS                   |  2 +-
 build/common.gypi      |  2 +-
 build/linux/system.gyp | 25 ++++++++++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/DEPS b/DEPS
index 3e3a96e..733798c 100644
--- a/DEPS
+++ b/DEPS
@@ -26,7 +26,7 @@ deps = {
 
   # TODO(mark): Remove once this has moved into depot_tools.
   "src/tools/gyp":
-    "http://gyp.googlecode.com/svn/trunk@416",
+    "http://gyp.googlecode.com/svn/trunk@417",
 
   "src/v8":
     "http://v8.googlecode.com/svn/trunk@1668",
diff --git a/build/common.gypi b/build/common.gypi
index a7532e4..07b4f5f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -127,7 +127,7 @@
           '-msse2',
           '-mfpmath=sse',
         ],
-        'linkflags': [
+        'ldflags': [
           '-m32',
           '-pthread',
         ],
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 0c6b7ed..44ac4ea 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -13,8 +13,11 @@
         ],
       },
       'link_settings': {
+        'ldflags': [
+          '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other gtk+-2.0)',
+        ],
         'libraries': [
-          '<!@(python pkg_config_wrapper.py --libs gtk+-2.0)',
+          '<!@(python pkg_config_wrapper.py --libs-only-l gtk+-2.0)',
         ],
       },
     },
@@ -27,8 +30,11 @@
         ],
       },
       'link_settings': {
+        'ldflags': [
+          '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other nss)',
+        ],
         'libraries': [
-          '<!@(python pkg_config_wrapper.py --libs nss)',
+          '<!@(python pkg_config_wrapper.py --libs-only-l nss)',
         ],
       },
     },
@@ -41,8 +47,11 @@
         ],
       },
       'link_settings': {
+        'ldflags': [
+          '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other freetype2)',
+        ],
         'libraries': [
-          '<!@(python pkg_config_wrapper.py --libs freetype2)',
+          '<!@(python pkg_config_wrapper.py --libs-only-l freetype2)',
         ],
       },
     },
@@ -55,8 +64,11 @@
         ],
       },
       'link_settings': {
+        'ldflags': [
+          '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other fontconfig)',
+        ],
         'libraries': [
-          '<!@(python pkg_config_wrapper.py --libs fontconfig)',
+          '<!@(python pkg_config_wrapper.py --libs-only-l fontconfig)',
         ],
       },
     },
@@ -69,8 +81,11 @@
         ],
       },
       'link_settings': {
+        'ldflags': [
+          '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other gdk-2.0)',
+        ],
         'libraries': [
-          '<!@(python pkg_config_wrapper.py --libs gdk-2.0)',
+          '<!@(python pkg_config_wrapper.py --libs-only-l gdk-2.0)',
         ],
       },
     },
-- 
cgit v1.1