diff options
| -rw-r--r-- | rules/pre/Rules.make | 3 | ||||
| -rwxr-xr-x | scripts/pkg-config-wrapper | 19 |
2 files changed, 1 insertions, 21 deletions
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 8902594e9..64196da44 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -186,10 +186,9 @@ CROSS_ENV_PROGS := \ # leave them in; the wrapper replaces them by proper # $(PTXDIST_SYSROOT_TARGET) correspondees. # - CROSS_ENV_PKG_CONFIG := \ SYSROOT="$(PTXDIST_SYSROOT_TARGET)" \ - PKG_CONFIG_PATH="$(PTXCONF_PKG_CONFIG_PATH)" \ + $(PTXDIST_CROSS_ENV_PKG_CONFIG) \ PKG_CONFIG="$(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config" CROSS_ENV_FLAGS := \ diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper index b51c8e890..8f2dbc51a 100755 --- a/scripts/pkg-config-wrapper +++ b/scripts/pkg-config-wrapper @@ -22,29 +22,10 @@ EOF exit 1 fi -export PKG_CONFIG_LIBDIR="${SYSROOT}/lib/pkgconfig:${SYSROOT}/usr/lib/pkgconfig" export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 unset found_var -if [ -n "${PKG_CONFIG_PATH}" ]; then - orig_ifs="${IFS}" - IFS=':' - pkg_config_path_array=( ${PKG_CONFIG_PATH} ) - IFS="${orig_ifs}" - unset orig_ifs - - PKG_CONFIG_PATH="${SYSROOT}${pkg_config_path_array[0]}" - unset pkg_config_path_array[0] - - for p in "${pkg_config_path_array[@]}"; do - PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${SYSROOT}${p}" - done - - unset p - unset pkg_config_path_array -fi - for ((i = 1; i <= ${#}; i++)); do case "${!i}" in --variable*) |