diff options
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/gcc.vars | 10 | ||||
| -rw-r--r-- | vars/midipix.vars | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/vars/gcc.vars b/vars/gcc.vars index 5cdfdbc5..01ded3b5 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -10,7 +10,7 @@ pkgp_gcc_build_dir() { pkgp_gcc_setup_env() { local __=""; - export MAKE="make LIBTOOL=rdlibtool"; + export MAKE="make LIBTOOL=slibtool"; export cbb_target="${PKG_TARGET}"; unwind_midipix_h=$(readlink -f "${PKG_BASE_DIR}/cbb-gcc-${1}/gcc/unwind-midipix.h"); case "${PKG_NAME}" in @@ -196,7 +196,7 @@ pkg_gcc_stage1_all() { pkg_gcc_runtime_host_all() { local _restart_at="${1}"; local _vis_hide="vis_hide=-fvisibility=hidden"; - export MAKE="make LIBTOOL=rdlibtool ${_vis_hide}"; + export MAKE="make LIBTOOL=slibtool ${_vis_hide}"; pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross; ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; # GCC, compiler runtime. @@ -220,7 +220,7 @@ pkg_gcc_runtime_host_all() { pkg_gcc_libstdcpp_v3_host_all() { local _restart_at="${1}"; - export MAKE="make LIBTOOL=rdlibtool"; + export MAKE="make LIBTOOL=slibtool"; pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross; ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; # GCC, libstdc++-v3. @@ -244,7 +244,7 @@ pkg_gcc_libstdcpp_v3_host_all() { pkg_gcc_full_host_all() { local _restart_at="${1}"; - export MAKE="make LIBTOOL=rdlibtool"; + export MAKE="make LIBTOOL=slibtool"; pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross; ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; # GCC, everything else. @@ -269,7 +269,7 @@ pkg_gcc_full_host_all() { pkg_gcc_full_all() { local _restart_at="${1}" _configure_host=""; local _vis_hide="vis_hide=-fvisibility=hidden"; - export MAKE="make LIBTOOL=rdlibtool ${_vis_hide}"; + export MAKE="make LIBTOOL=slibtool ${_vis_hide}"; # GCC, native. pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native; if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then diff --git a/vars/midipix.vars b/vars/midipix.vars index 6f8dffb9..7a779d57 100644 --- a/vars/midipix.vars +++ b/vars/midipix.vars @@ -67,20 +67,20 @@ : ${DEFAULT_CROSS_AR:=${DEFAULT_TARGET}-ar}; : ${DEFAULT_CROSS_CC:=${DEFAULT_TARGET}-gcc}; : ${DEFAULT_CROSS_CXX:=${DEFAULT_TARGET}-g++}; -: ${DEFAULT_CROSS_LIBTOOL:=rdlibtool}; -: ${DEFAULT_CROSS_MAKE:=make LIBTOOL=rdlibtool}; +: ${DEFAULT_CROSS_LIBTOOL:=slibtool}; +: ${DEFAULT_CROSS_MAKE:=make LIBTOOL=slibtool}; : ${DEFAULT_CROSS_RANLIB:=${DEFAULT_TARGET}-ranlib}; : ${DEFAULT_HOST_AR:=ar}; : ${DEFAULT_HOST_CC:=gcc}; : ${DEFAULT_HOST_CXX:=g++}; -: ${DEFAULT_HOST_LIBTOOL:=rdlibtool}; -: ${DEFAULT_HOST_MAKE:=make LIBTOOL=rdlibtool}; +: ${DEFAULT_HOST_LIBTOOL:=slibtool}; +: ${DEFAULT_HOST_MAKE:=make LIBTOOL=slibtool}; : ${DEFAULT_HOST_RANLIB:=ranlib}; : ${DEFAULT_NATIVE_AR:=${DEFAULT_TARGET}-ar}; : ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc}; : ${DEFAULT_NATIVE_CXX:=${DEFAULT_TARGET}-g++}; -: ${DEFAULT_NATIVE_LIBTOOL:=rdlibtool}; -: ${DEFAULT_NATIVE_MAKE:=make LIBTOOL=rdlibtool}; +: ${DEFAULT_NATIVE_LIBTOOL:=slibtool}; +: ${DEFAULT_NATIVE_MAKE:=make LIBTOOL=slibtool}; : ${DEFAULT_NATIVE_PKGCONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config}; : ${DEFAULT_NATIVE_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config}; : ${DEFAULT_NATIVE_PKG_CONFIG_LIBDIR:=${PREFIX_NATIVE}/lib/pkgconfig}; |