|
|
Created:
4 years, 11 months ago by Sam Clegg Modified:
4 years, 11 months ago Reviewers:
rjkroege, Lei Zhang, Dirk Pranke CC:
chromium-reviews Base URL:
https://chromium.googlesource.com/chromium/src.git@master Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionGN: Only honour system_libdir for target toolchain
Without this change when system_libdir is set (e.g.
to lib64) it would apply this to all toolchains
including the host toolchain.
Committed: https://crrev.com/d4566597ab32adc5586831308625c0de954e4920
Cr-Commit-Position: refs/heads/master@{#371875}
Patch Set 1 #
Created: 4 years, 11 months ago
Messages
Total messages: 16 (6 generated)
Description was changed from ========== GN: Only honour system_libdir for target toolchain ========== to ========== GN: Only honour system_libdir for target toolchain Without this change when system_libdir is set (e.g. to lib64) it would apply this to all toolchains including the host toolchain. ==========
sbc@chromium.org changed reviewers: + rjkroege@chromium.org, thestig@chromium.org
sbc@chromium.org changed reviewers: + dpranke@chromium.org
On 2016/01/14 01:46:22, Sam Clegg wrote: I verified for CrOS board specific GN builds (which is where system_libdir set to lib64 is needed.) Thanks for writing. LGTM
I don't understand this change; why don't we want this to apply to the host toolchains as well, since even those should also be using sysroots?
On 2016/01/26 01:33:43, Dirk Pranke wrote: > I don't understand this change; why don't we want this to apply to the host > toolchains as well, since even those should also be using sysroots? The linux sysroots keep their pkgconfig in lib: ; find build/linux/* -name 'pkgcfind build/linux/* -name 'pkgconfig' build/linux/debian_wheezy_amd64-sysroot/usr/lib/pkgconfig build/linux/debian_wheezy_amd64-sysroot/usr/share/pkgconfig build/linux/debian_wheezy_arm-sysroot/usr/lib/arm-linux-gnueabihf/pkgconfig build/linux/debian_wheezy_arm-sysroot/usr/share/pkgconfig build/linux/debian_wheezy_i386-sysroot/usr/lib/pkgconfig build/linux/debian_wheezy_i386-sysroot/usr/share/pkgconfig But CrOS x64 sysroots keep their pkgconfig in lib64: ; find auron_paine+7644.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz -name pkgconfig ./auron_paine+7644.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz/usr/share/pkgconfig ./auron_paine+7644.0.0+sysroot_chromeos-base_chromeos-chrome.tar.xz/usr/lib64/pkgconfig So: rather than changing all of the CrOS sysroots, this patch instead.
On 2016/01/26 01:33:43, Dirk Pranke wrote: > I don't understand this change; why don't we want this to apply to the host > toolchains as well, since even those should also be using sysroots? The problem this change tries to solve is with the chromeOS builds. Apparently chromeos uses the system_libdir setting along with target_sysroot since their 64-bit libs are in 'lib64' rather than the default 'lib'. However, the host toolchain have 'lib64' in it. I think the reason this wasn't noticed in the gyp build is because the gyp build just runs pkg-config just once, rather than once for each toolchain. Perhaps we could rename 'system_libdir' to 'target_libdir' to make it clean that it only applies to the target_sysroot?
On 2016/01/26 01:47:49, Sam Clegg wrote: > On 2016/01/26 01:33:43, Dirk Pranke wrote: > > I don't understand this change; why don't we want this to apply to the host > > toolchains as well, since even those should also be using sysroots? > > The problem this change tries to solve is with the chromeOS builds. Apparently > chromeos uses the system_libdir setting along with target_sysroot since their > 64-bit libs are in 'lib64' rather than the default 'lib'. > > However, the host toolchain have 'lib64' in it. That should have been "doesn't have". > > I think the reason this wasn't noticed in the gyp build is because the gyp build > just runs pkg-config just once, rather than once for each toolchain. > > Perhaps we could rename 'system_libdir' to 'target_libdir' to make it clean that > it only applies to the target_sysroot?
Oh, got it, I hadn't properly absorbed/understood the earlier system_libdir patch. lgtm.
The CQ bit was checked by sbc@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1583093002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1583093002/1
Message was sent while issue was closed.
Description was changed from ========== GN: Only honour system_libdir for target toolchain Without this change when system_libdir is set (e.g. to lib64) it would apply this to all toolchains including the host toolchain. ========== to ========== GN: Only honour system_libdir for target toolchain Without this change when system_libdir is set (e.g. to lib64) it would apply this to all toolchains including the host toolchain. ==========
Message was sent while issue was closed.
Committed patchset #1 (id:1)
Message was sent while issue was closed.
Description was changed from ========== GN: Only honour system_libdir for target toolchain Without this change when system_libdir is set (e.g. to lib64) it would apply this to all toolchains including the host toolchain. ========== to ========== GN: Only honour system_libdir for target toolchain Without this change when system_libdir is set (e.g. to lib64) it would apply this to all toolchains including the host toolchain. Committed: https://crrev.com/d4566597ab32adc5586831308625c0de954e4920 Cr-Commit-Position: refs/heads/master@{#371875} ==========
Message was sent while issue was closed.
Patchset 1 (id:??) landed as https://crrev.com/d4566597ab32adc5586831308625c0de954e4920 Cr-Commit-Position: refs/heads/master@{#371875} |