summaryrefslogtreecommitdiffstats
path: root/app/resource_bundle_posix.cc
diff options
context:
space:
mode:
authorpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 00:43:49 +0000
committerpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 00:43:49 +0000
commite06c3beae331e70eb038a859b0ab6945fef041fb (patch)
tree7ed17c010a3fbe6a5c29a6cd4c59a96886632d03 /app/resource_bundle_posix.cc
parent59c9f0028c93f79b2b566b41b6fb5bf1d58d1c84 (diff)
downloadchromium_src-e06c3beae331e70eb038a859b0ab6945fef041fb.zip
chromium_src-e06c3beae331e70eb038a859b0ab6945fef041fb.tar.gz
chromium_src-e06c3beae331e70eb038a859b0ab6945fef041fb.tar.bz2
Improve pkg-config-wrapper to support ChromiumOS sysroots
http://codereview.chromium.org/4516002/show had to be reverted because it conflicts with "old style" sysroots that are still used on the arm builders. This is a cleaner approach that should work there. The previous approach assumed that all variables in .pc files were relative to |prefix|. It would be a desirable thing to have but in practice a few packages don't follow this and have already dereferenced |prefix| in other variables (e.g. |libdir|). So instead of forcing |prefix|, this version keeps the original one but strips the path before '/usr' (in |prefix|) from all returned paths before prepending the sysroot path. For example if you have foo.pc: prefix=/build/board/usr libdir=/build/board/usr/lib # instead of libdir=${prefix}/lib Libs: -L${libdir}/foo -lfoo Then instead of forcing prefix=/usr (which doesn't fix |libdir|), we find the path before '/usr' in prefix ('/build/board'), that we strip from the returned -L flag ('/build/board/usr/lib/foo' -> '/usr/lib/foo') before prepending the sysroot path (-> '/path/to/sysroot/usr/lib/foo'). BUG=None TEST=build with sysroot=/path/to/chromiumos/chroot/build/x86-generic Review URL: http://codereview.chromium.org/5105005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_posix.cc')
0 files changed, 0 insertions, 0 deletions