diff options
| -rwxr-xr-x | build/linux/pkg-config-wrapper | 8 | ||||
| -rw-r--r-- | build/linux/system.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 2 | ||||
| -rw-r--r-- | media/media.gyp | 2 | ||||
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 2 | ||||
| -rw-r--r-- | third_party/harfbuzz-ng/harfbuzz.gyp | 2 | ||||
| -rw-r--r-- | third_party/libexif/libexif.gyp | 2 |
7 files changed, 11 insertions, 9 deletions
diff --git a/build/linux/pkg-config-wrapper b/build/linux/pkg-config-wrapper index 14ee01b..b759564 100755 --- a/build/linux/pkg-config-wrapper +++ b/build/linux/pkg-config-wrapper @@ -19,18 +19,20 @@ root="$1" shift target_arch="$1" shift +libpath="$1" +shift if [ -z "$root" -o -z "$target_arch" ] then - echo "usage: $0 /path/to/sysroot target_arch [pkg-config-arguments] package" >&2 + echo "usage: $0 /path/to/sysroot target_arch libdir [pkg-config-arguments] package" >&2 exit 1 fi if [ "$target_arch" = "x64" ] then - libpath="lib64" + : ${libpath:="lib64"} else - libpath="lib" + : ${libpath:="lib"} fi rewrite=`dirname $0`/rewrite_dirs.py diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 84bfbbf..b798256 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -6,7 +6,7 @@ 'variables': { 'conditions': [ ['sysroot!=""', { - 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', # libgcrypt-config-wrapper invokes libgcrypt-config directly from the # sysroot, so there's no need to prefix it with <(chroot_cmd). 'libgcrypt-config': './libgcrypt-config-wrapper "<(sysroot)"', diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 96de3da..e88bfa5 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -11,7 +11,7 @@ 'variables': { 'conditions': [ ['sysroot!=""', { - 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', }, { 'pkg-config': 'pkg-config' }], diff --git a/media/media.gyp b/media/media.gyp index bfe7627..4f6068b 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -37,7 +37,7 @@ 'use_pulseaudio%': 0, }], ['sysroot!=""', { - 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', }, { 'pkg-config': 'pkg-config' }], diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index 986b563..f0c47d6 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -8,7 +8,7 @@ 'conditions': [ ['sysroot!=""', { 'variables': { - 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', }, }, { 'variables': { diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp index 087e3dc..77b0fee 100644 --- a/third_party/harfbuzz-ng/harfbuzz.gyp +++ b/third_party/harfbuzz-ng/harfbuzz.gyp @@ -10,7 +10,7 @@ 'variables': { 'conditions': [ ['sysroot!=""', { - 'pkg-config': '<(chroot_cmd) ../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + 'pkg-config': '<(chroot_cmd) ../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', }, { 'pkg-config': 'pkg-config' }], diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp index a200745..5819b3a 100644 --- a/third_party/libexif/libexif.gyp +++ b/third_party/libexif/libexif.gyp @@ -107,7 +107,7 @@ 'conditions': [ ['sysroot!=""', { 'variables': { - 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', }, }, { 'variables': { |