diff options
| author | Adrien Nader <adrien@notk.org> | 2014-12-12 10:33:36 +0100 |
|---|---|---|
| committer | Adrien Nader <adrien@notk.org> | 2014-12-12 10:33:36 +0100 |
| commit | 2c2162e72273c25a8b5fe2ba558da999175666b6 (patch) | |
| tree | 0c18d1bfdce4f465896845e8068f51b7432adbc0 /zz_config/win-builds-switch.in | |
| parent | 3ec32e6b3ed5ff9b400f59d74b1ff3bfb0ea3a1b (diff) | |
zz_config/win-builds-switch: add native_toolchain/bin to $PATH for cross.
Diffstat (limited to 'zz_config/win-builds-switch.in')
| -rw-r--r-- | zz_config/win-builds-switch.in | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/zz_config/win-builds-switch.in b/zz_config/win-builds-switch.in index 0fcea3f..d1f3be7 100644 --- a/zz_config/win-builds-switch.in +++ b/zz_config/win-builds-switch.in @@ -36,10 +36,17 @@ put_toolchain_in_path() { local BASE="${1}" local BITS="${2}" + local BASE2 + if [ -n "${BITS}" ]; then + BASE2="${BASE}_" + else + BASE2="${BASE}" + fi + replace_in_path \ - "/opt/${BASE}_??/bin" \ - "/opt/${BASE}_../bin" \ - "/opt/${BASE}_${BITS}/bin" + "/opt/${BASE2}??/bin" \ + "/opt/${BASE2}../bin" \ + "/opt/${BASE2}${BITS}/bin" } unset PKG_CONFIG_PATH @@ -59,6 +66,7 @@ else # Cygwin, Linux, possibly any other PKG_CONFIG_LIBDIR="@@YYPREFIX_TARGET@@/lib@@LIBDIRSUFFIX@@/pkgconfig" put_toolchain_in_path "cross_toolchain" "@@BITS@@" + put_toolchain_in_path "windows" "" fi export PKG_CONFIG_LIBDIR |