diff options
| author |   Kirill K. Smirnov <kirill.k.smirnov@gmail.com> | 2016-09-10 00:35:53 (GMT) |
|---|---|---|
| committer | Kirill K. Smirnov <kirill.k.smirnov@gmail.com> | 2016-09-10 00:35:53 (GMT) |
| commit | 5fd69f7652b0854b0eeba6b96c6a80ed0efc67a2 (patch) | |
| tree | fe15e45f47ec46723bc1e2f507fb2f0640fc8bef /scripts | |
| parent | 5d5465307b8dac17855d6fe74653fe634144f91b (diff) | |
complibs: let mingw-gcc find target companion libs
mingw-gcc searches for include and libs in <sysroot>/mingw
directory while non-mingw-gcc uses <sysroot>/usr. This patch
sets an appropriate prefix for target companion libs.
Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_libs/200-libelf.sh | 13 | ||||
| -rwxr-xr-x | scripts/build/companion_libs/210-expat.sh | 11 | ||||
| -rw-r--r-- | scripts/build/companion_libs/220-ncurses.sh | 12 |
3 files changed, 33 insertions, 3 deletions
diff --git a/scripts/build/companion_libs/200-libelf.sh b/scripts/build/companion_libs/200-libelf.sh index 529bba2..b373b54 100644 --- a/scripts/build/companion_libs/200-libelf.sh +++ b/scripts/build/companion_libs/200-libelf.sh @@ -69,13 +69,24 @@ if [ "${CT_LIBELF_TARGET}" = "y" ]; then do_libelf_for_target() { local -a libelf_opts + local prefix CT_DoStep INFO "Installing libelf for the target" CT_mkdir_pushd "${CT_BUILD_DIR}/build-libelf-target-${CT_TARGET}" + case "${CT_TARGET}" in + *-*-mingw*) + prefix="/mingw" + ;; + *) + prefix="/usr" + ;; + esac + libelf_opts+=( "destdir=${CT_SYSROOT_DIR}" ) libelf_opts+=( "host=${CT_TARGET}" ) - libelf_opts+=( "prefix=/usr" ) + + libelf_opts+=( "prefix=${prefix}" ) libelf_opts+=( "shared=y" ) do_libelf_backend "${libelf_opts[@]}" diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh index 7801d33..251d590 100755 --- a/scripts/build/companion_libs/210-expat.sh +++ b/scripts/build/companion_libs/210-expat.sh @@ -43,12 +43,21 @@ fi if [ "${CT_EXPAT_TARGET}" = "y" ]; then do_expat_for_target() { local -a expat_opts + local prefix CT_DoStep INFO "Installing expat for target" CT_mkdir_pushd "${CT_BUILD_DIR}/build-expat-target-${CT_TARGET}" expat_opts+=( "host=${CT_TARGET}" ) - expat_opts+=( "prefix=/usr" ) + case "${CT_TARGET}" in + *-*-mingw*) + prefix="/mingw" + ;; + *) + prefix="/usr" + ;; + esac + expat_opts+=( "prefix=${prefix}" ) expat_opts+=( "destdir=${CT_SYSROOT_DIR}" ) expat_opts+=( "static_build=y" ) diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index 18cd4d9..a740339 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -72,13 +72,23 @@ fi if [ "${CT_NCURSES_TARGET}" = "y" ]; then do_ncurses_for_target() { + local prefix + CT_DoStep INFO "Installing ncurses for target" CT_mkdir_pushd "${CT_BUILD_DIR}/build-ncurses-target-${CT_TARGET}" opts=("--without-sysmouse") [ "${CT_CC_LANG_CXX}" = "y" ] || opts+=("--without-cxx" "--without-cxx-binding") [ "${CT_CC_LANG_ADA}" = "y" ] || opts+=("--without-ada") + case "${CT_TARGET}" in + *-*-mingw*) + prefix="/mingw" + ;; + *) + prefix="/usr" + ;; + esac do_ncurses_backend host="${CT_TARGET}" \ - prefix="/usr" \ + prefix="${prefix}" \ destdir="${CT_SYSROOT_DIR}" \ "${opts[@]}" CT_Popd |