diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 22:52:17 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 22:52:17 +0000 |
| commit | 66a7ace0cd0ba0a421e65622842d2095d02717b8 (patch) | |
| tree | a6161505be0b7f703febb3a23761f248ca4fd844 /build | |
| parent | e2e3609d7af376a440c9a3e56219ba197c6990eb (diff) | |
| download | chromium_src-66a7ace0cd0ba0a421e65622842d2095d02717b8.zip chromium_src-66a7ace0cd0ba0a421e65622842d2095d02717b8.tar.gz chromium_src-66a7ace0cd0ba0a421e65622842d2095d02717b8.tar.bz2 | |
Fix pkgconfig wrapper for 64 bits
BUG=none
TEST=build 64-bit version of chrome using 64-bit chromeos sysroot
Review URL: http://codereview.chromium.org/9654001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/linux/pkg-config-wrapper | 20 | ||||
| -rw-r--r-- | build/linux/system.gyp | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/build/linux/pkg-config-wrapper b/build/linux/pkg-config-wrapper index 4b5455b..c39e5cd 100755 --- a/build/linux/pkg-config-wrapper +++ b/build/linux/pkg-config-wrapper @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -13,17 +13,27 @@ # directory of a Chromium OS chroot. root="$1" -if [ -z "$root" ] +shift +target_arch="$1" +shift + +if [ -z "$root" -o -z "$target_arch" ] then - echo "usage: $0 /path/to/sysroot [pkg-config-arguments] package" >&2 + echo "usage: $0 /path/to/sysroot target_arch [pkg-config-arguments] package" >&2 exit 1 fi +if [ "$target_arch" = "x64" ] +then + libpath="lib64" +else + libpath="lib" +fi + rewrite=`dirname $0`/rewrite_dirs.py package=${!#} -shift -config_path=$root/usr/lib/pkgconfig:$root/usr/share/pkgconfig +config_path=$root/usr/$libpath/pkgconfig:$root/usr/share/pkgconfig set -e # Some sysroots, like the Chromium OS ones, may generate paths that are not # relative to the sysroot. For example, diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 80581ab..60a438c 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -6,7 +6,7 @@ 'conditions': [ ['sysroot!=""', { 'variables': { - 'pkg-config': './pkg-config-wrapper "<(sysroot)"', + 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', }, }, { 'variables': { |