Skip to content

Commit d60ce23

Browse files
committed
[build-script] Don't clobber PKG_CONFIG_PATH
Overwriting this variable can cause the build to break when pkg-config tries to find packages that aren't ICU. Prepending the ICU path so it takes precedence is a less fragile solution.
1 parent cd4909b commit d60ce23

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

utils/build-script-impl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2587,7 +2587,7 @@ for host in "${ALL_HOSTS[@]}"; do
25872587

25882588
# Set the PKG_CONFIG_PATH so that core-foundation can find the libraries and
25892589
# header files
2590-
export PKG_CONFIG_PATH="${ICU_TMPLIBDIR}/pkgconfig"
2590+
export PKG_CONFIG_PATH="${ICU_TMPLIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
25912591
swift_cmake_options=(
25922592
"${swift_cmake_options[@]}"
25932593
-DSWIFT_${SWIFT_HOST_VARIANT_SDK}_${SWIFT_HOST_VARIANT_ARCH}_ICU_UC_INCLUDE:STRING="${ICU_TMPINSTALL}/include"

0 commit comments

Comments
 (0)