Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2901)

Unified Diff: build/linux/sysroot_scripts/sysroot-creator.sh

Issue 1580643002: Use PKG_CONFIG_LIBDIR to force pkg-config to use sysroot only (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor_pkg_config
Patch Set: ; Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/linux/pkg-config-wrapper ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/sysroot_scripts/sysroot-creator.sh
diff --git a/build/linux/sysroot_scripts/sysroot-creator.sh b/build/linux/sysroot_scripts/sysroot-creator.sh
index 39c787f5a16ae68f9f9fef2f5046b256ee74932c..e05cf2573aebc17524e05e0b84c2d94dbc058eec 100644
--- a/build/linux/sysroot_scripts/sysroot-creator.sh
+++ b/build/linux/sysroot_scripts/sysroot-creator.sh
@@ -261,7 +261,7 @@ HacksAndPatchesAmd64() {
sed -i -e 's|/lib/x86_64-linux-gnu/||g' ${lscripts}
# This is for chrome's ./build/linux/pkg-config-wrapper
- # which overwrites PKG_CONFIG_PATH internally
+ # which overwrites PKG_CONFIG_LIBDIR internally
SubBanner "Move pkgconfig scripts"
mv ${INSTALL_ROOT}/usr/lib/x86_64-linux-gnu/pkgconfig ${INSTALL_ROOT}/usr/lib/
@@ -284,7 +284,7 @@ HacksAndPatchesI386() {
sed -i -e 's|/lib/i386-linux-gnu/||g' ${lscripts}
# This is for chrome's ./build/linux/pkg-config-wrapper
- # which overwrites PKG_CONFIG_PATH internally
+ # which overwrites PKG_CONFIG_LIBDIR internally
SubBanner "Move pkgconfig scripts"
mv ${INSTALL_ROOT}/usr/lib/i386-linux-gnu/pkgconfig ${INSTALL_ROOT}/usr/lib/
@@ -307,7 +307,7 @@ HacksAndPatchesARM() {
sed -i -e 's|/lib/arm-linux-gnueabihf/||g' ${lscripts}
# This is for chrome's ./build/linux/pkg-config-wrapper
- # which overwrites PKG_CONFIG_PATH internally
+ # which overwrites PKG_CONFIG_LIBDIR internally
SubBanner "Move pkgconfig files"
mv ${INSTALL_ROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig \
${INSTALL_ROOT}/usr/lib/
@@ -326,7 +326,7 @@ HacksAndPatchesMips() {
sed -i -e 's|/lib/mipsel-linux-gnu/||g' ${lscripts}
# This is for chrome's ./build/linux/pkg-config-wrapper
- # which overwrites PKG_CONFIG_PATH internally
+ # which overwrites PKG_CONFIG_LIBDIR internally
SubBanner "Move pkgconfig files"
mv ${INSTALL_ROOT}/usr/lib/mipsel-linux-gnu/pkgconfig \
${INSTALL_ROOT}/usr/lib/
« no previous file with comments | « build/linux/pkg-config-wrapper ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698