mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-20 09:06:19 +00:00
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>
This commit is contained in:
parent
5d5465307b
commit
5fd69f7652
@ -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[@]}"
|
||||
|
||||
|
@ -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" )
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user