diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 04:07:38 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 04:07:38 +0000 |
| commit | a6cf87ec511a64fc29c0bda5cf83ec282d34be59 (patch) | |
| tree | ccc61c0d6577af457ad5d9e9acbd56ce889e9955 /build | |
| parent | 1e1f6af9207b71845aa2f360e5d231825f317a09 (diff) | |
| download | chromium_src-a6cf87ec511a64fc29c0bda5cf83ec282d34be59.zip chromium_src-a6cf87ec511a64fc29c0bda5cf83ec282d34be59.tar.gz chromium_src-a6cf87ec511a64fc29c0bda5cf83ec282d34be59.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | build/linux/system.gyp | 25 |
2 files changed, 21 insertions, 6 deletions
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)', ], }, }, |