diff options
| author | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-03-26 13:24:19 +0200 |
|---|---|---|
| committer | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-03-26 13:28:20 +0200 |
| commit | a9f452c3ce16b9e3ac9dcc993d1641ade1049e65 (patch) | |
| tree | 66044d87150d3a4814811b083b5a116a083806ed | |
| parent | d82a0f1fcbf04642b53fb61ef6b80d610ef0ecf3 (diff) | |
| download | midipix_build-a9f452c3ce16b9e3ac9dcc993d1641ade1049e65.tar.bz2 midipix_build-a9f452c3ce16b9e3ac9dcc993d1641ade1049e65.tar.xz | |
vars/{gcc,libfirm,psxstub_host}.vars: correctly expand ${PKG_MAKEFLAGS_BUILD:-}.
| -rw-r--r-- | vars/gcc.vars | 32 | ||||
| -rw-r--r-- | vars/libfirm.vars | 4 | ||||
| -rw-r--r-- | vars/psxstub_host.vars | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/vars/gcc.vars b/vars/gcc.vars index fc7c4062..d07e72ad 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -225,7 +225,7 @@ pkgp_gcc_stage1_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} "all-gcc" || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} "all-gcc" || return 1; pkgp_gcc_state_set "build" "install_subdirs"; fi; @@ -238,13 +238,13 @@ pkgp_gcc_stage1_all() { case "${PKG_NAME}" in gcc_stage1_cross_mingw32) - make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-gcc"; ;; + make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-gcc"; ;; gcc_stage1_host) - make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-gcc"; ;; + make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-gcc"; ;; gcc_stage1_native_mingw32) - make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-gcc"; ;; + make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-gcc"; ;; esac; @@ -332,11 +332,11 @@ pkg_gcc_full_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then - if ! make ${PKG_MAKEFLAGS_BUILD} "all-gcc"\ - || ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libgcc" ${_vis_hide}\ - || ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libstdc++-v3"\ - || ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libgfortran"\ - || ! make ${PKG_MAKEFLAGS_BUILD} "all"; then + if ! make ${PKG_MAKEFLAGS_BUILD:-} "all-gcc"\ + || ! make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libgcc" ${_vis_hide}\ + || ! make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libstdc++-v3"\ + || ! make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libgfortran"\ + || ! make ${PKG_MAKEFLAGS_BUILD:-} "all"; then return 1; else pkgp_gcc_state_set "build" "install_subdirs"; fi; @@ -348,7 +348,7 @@ pkg_gcc_full_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install" || return 1; pkgp_gcc_state_set "install_make" "install"; fi; @@ -371,7 +371,7 @@ pkg_gcc_full_host_all() { return 1; else if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} || return 1; pkgp_gcc_state_set "build" "install_subdirs"; fi; @@ -381,7 +381,7 @@ pkg_gcc_full_host_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install" || return 1; pkgp_gcc_state_set "install_make" "install"; fi; @@ -405,7 +405,7 @@ pkg_gcc_libstdcpp_v3_host_all() { return 1; else if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} "all-target-libstdc++-v3" || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libstdc++-v3" || return 1; pkgp_gcc_state_set "build" "install_subdirs"; fi; @@ -415,7 +415,7 @@ pkg_gcc_libstdcpp_v3_host_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libstdc++-v3" || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-target-libstdc++-v3" || return 1; pkgp_gcc_state_set "install_make" "install"; fi; @@ -440,7 +440,7 @@ pkg_gcc_runtime_host_all() { return 1; else if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} "all-target-libgcc" ${_vis_hide} || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libgcc" ${_vis_hide} || return 1; pkgp_gcc_state_set "build" "install_subdirs"; fi; @@ -450,7 +450,7 @@ pkg_gcc_runtime_host_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then - make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libgcc" || return 1; + make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-target-libgcc" || return 1; pkgp_gcc_state_set "install_make" "install"; fi; diff --git a/vars/libfirm.vars b/vars/libfirm.vars index 47886b8e..f08d718a 100644 --- a/vars/libfirm.vars +++ b/vars/libfirm.vars @@ -7,11 +7,11 @@ pkg_cparser_configure_pre() { }; pkg_cparser_install_make() { - make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install; + make ${PKG_MAKEFLAGS_BUILD:-} DESTDIR="${PKG_DESTDIR}" install; }; pkg_libfirm_install_make() { - make ${PKG_MAKEFLAGS_BUILD} DESTDIR="${PKG_DESTDIR}" install; + make ${PKG_MAKEFLAGS_BUILD:-} DESTDIR="${PKG_DESTDIR}" install; }; # vim:filetype=sh textwidth=0 diff --git a/vars/psxstub_host.vars b/vars/psxstub_host.vars index 07d69305..41d0d603 100644 --- a/vars/psxstub_host.vars +++ b/vars/psxstub_host.vars @@ -6,7 +6,7 @@ pkg_psxstub_install_make() { if [ "${PKG_TARGET}" = "i686-nt32-midipix" ]\ || [ "${PKG_TARGET}" = "x86_64-nt64-midipix" ]; then if ! rtl_fileop cd "${PKG_BASE_DIR}/psxstub"\ - || ! make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" "TARGET=${PKG_TARGET}" install; then + || ! make ${PKG_MAKEFLAGS_BUILD:-} "DESTDIR=${PKG_PREFIX}" "TARGET=${PKG_TARGET}" install; then return 1; elif [ -e "${PKG_PREFIX}/lib/libpsxscl.a" ]\ && ! rtl_fileop rm "${PKG_PREFIX}/lib/libpsxscl.a"; then |