summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorhidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-26 04:00:08 +0000
committerhidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-26 04:00:08 +0000
commitf7e45c1037255b679bb0ed7017a79acb7914382b (patch)
treee1086652832eaa7f49a9710fe1735f89ab81637b /build
parent8bee9c0b0949f8e32924d72af12b9252da1a8cb3 (diff)
downloadchromium_src-f7e45c1037255b679bb0ed7017a79acb7914382b.zip
chromium_src-f7e45c1037255b679bb0ed7017a79acb7914382b.tar.gz
chromium_src-f7e45c1037255b679bb0ed7017a79acb7914382b.tar.bz2
Fix linker warning on build with target_arch=ia32.
Since r257419, linker warning starts to cause the build failure. This CL is fixing some linker warnings on cross compilation build so that build with target_arch=ia32 option works properly. Here are the error logs: /usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libgcrypt.so when searching for -lgcrypt /usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libgcrypt.a when searching for -lgcrypt /usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libcap.so when searching for -lcap /usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libcap.a when searching for -lcap /usr/bin/ld: warning: libgnutls.so.26, needed by /usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib32/libcups.so, may conflict with libgnutls.so.28 BUG=n/a TEST=build with GYP_DEFINES=target_arch=ia32, run trybot. Review URL: https://codereview.chromium.org/202633008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/linux/system.gyp5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 29cb33a..569ab63 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -745,7 +745,10 @@
},
'link_settings': {
'libraries': [
- '<!@(<(libgcrypt-config) --libs)',
+ # libgcrypt-config does not support --libs-only-l options,
+ # and the result contains -L options, which shouldn't be in
+ # the entries of 'libraries'. So filter them out.
+ '<!@(<(libgcrypt-config) --libs | sed -e \'s/-L[^ ]*//g\')',
],
},
}],