diff options
| author | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 04:00:08 +0000 |
|---|---|---|
| committer | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 04:00:08 +0000 |
| commit | f7e45c1037255b679bb0ed7017a79acb7914382b (patch) | |
| tree | e1086652832eaa7f49a9710fe1735f89ab81637b /printing/cups_config_helper.py | |
| parent | 8bee9c0b0949f8e32924d72af12b9252da1a8cb3 (diff) | |
| download | chromium_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 'printing/cups_config_helper.py')
| -rwxr-xr-x | printing/cups_config_helper.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/printing/cups_config_helper.py b/printing/cups_config_helper.py index 3fe5fe0..976054f 100755 --- a/printing/cups_config_helper.py +++ b/printing/cups_config_helper.py @@ -46,6 +46,11 @@ def run_cups_config(mode): if flag_mode is None or flag_mode == mode: flags_subset.append(flag) + # Note: cross build is confused by the option, and may trigger linker + # warning causing build error. + if '-lgnutls' in flags_subset: + flags_subset.remove('-lgnutls') + return flags_subset |