diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-06 02:49:26 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-06 04:23:24 +0000 |
| commit | d5afb4ad3d60f078e64e402e403f0e55fc711714 (patch) | |
| tree | 97b07d1cb8e54c3c7003a7743da069b9517f6bd4 /subr/pkg_setup_env.subr | |
| parent | 8ee843a21869a1dc38a7fc7b543b7a5a1231a4e9 (diff) | |
| download | midipix_build-d5afb4ad3d60f078e64e402e403f0e55fc711714.tar.bz2 midipix_build-d5afb4ad3d60f078e64e402e403f0e55fc711714.tar.xz | |
build.sh, {subr,vars}/*: general cleanup.
Diffstat (limited to 'subr/pkg_setup_env.subr')
| -rw-r--r-- | subr/pkg_setup_env.subr | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr index 60d5aec2..83c24117 100644 --- a/subr/pkg_setup_env.subr +++ b/subr/pkg_setup_env.subr @@ -25,6 +25,23 @@ pkg_setup_env() { [ -z "${PKG_SUBDIR}" ] && PKG_SUBDIR="${PKG_FNAME%%.tar*}"; [ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}"; [ -z "${MIDIPIX_BUILD_PWD}" ] && MIDIPIX_BUILD_PWD="$(pwd)"; + if [ -z "${PKG_BUILD_DIR}" ]; then + set_build_dir "${PKG_SUBDIR}" "${PKG_BUILD_TYPE:-native}"; + fi; + if [ "${PKG_BUILD_TYPE}" = "host" ]; then + export AR="ar"; + export CC="gcc"; + export CXX="g++"; + export RANLIB="ranlib"; + else + export AR="${PKG_TARGET}-ar"; + export CC="${PKG_TARGET}-gcc"; + export CXX="${PKG_TARGET}-g++"; + export RANLIB="${PKG_TARGET}-ranlib"; + fi; + if [ "${PKG_SLIBTOOL}" != "default" ]; then + export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; + fi; fi; for __ in $(set); do if [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]; then @@ -34,21 +51,6 @@ pkg_setup_env() { if [ -n "${_log_env_vars}" ]; then log_env_vars "build" ${_log_env_vars}; fi; - build_fileop cd "${WORKDIR}"; - if [ "${PKG_BUILD_TYPE}" = "host" ]; then - export AR="ar"; - export CC="gcc"; - export CXX="g++"; - export RANLIB="ranlib"; - else - export AR="${PKG_TARGET}-ar"; - export CC="${PKG_TARGET}-gcc"; - export CXX="${PKG_TARGET}-g++"; - export RANLIB="${PKG_TARGET}-ranlib"; - fi; - if [ "${PKG_SLIBTOOL}" != "default" ]; then - export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; - fi; }; # vim:filetype=sh |