diff options
| -rwxr-xr-x | scripts/build | 9 | ||||
| -rwxr-xr-x | scripts/builder/build-compile | 16 |
2 files changed, 14 insertions, 11 deletions
diff --git a/scripts/build b/scripts/build index b8cd444..d7fc40d 100755 --- a/scripts/build +++ b/scripts/build @@ -201,6 +201,7 @@ fi # This may be a little bit confusing to most. The core issue here is the # ability to deal with compiled-in defaults, user-defined defaults, environment # settings, and target settings. +BUILDER_CFGDIR="${BUILDER_TOPDIR}/.builder" # first clear the variables that would be set by the configs CFGDIR= @@ -210,16 +211,20 @@ ATFDIR= LIBDIR= # grab the default and target settings if available, let the target settings # override the user-defined defaults. -[ -f "${BUILDER_CFGDIR}/default" ] && . "${BUILDER_CFGDIR}/default" +if [ "${TARGET}" = "default" ]; then + . "${BUILDER_CFGDIR}/default" +fi + if [ "${TARGET}" != "default" ]; then if [ ! -f "${BUILDER_CFGDIR}/${TARGET}" ]; then echo "error: invalid target '${TARGET}'" >&2 exit 1 fi + BUILDER_CONFIG="${BUILDER_CFGDIR}/${TARGET}" fi +. "${BUILDER_CONFIG}" # set the builtin defaults based on the BUILDER_TOPDIR -BUILDER_CFGDIR="${BUILDER_CFGDIR:-${BUILDER_TOPDIR}/.builder}" BUILDER_PKGDIR="${BUILDER_PKGDIR:-${BUILDER_TOPDIR}/packages}" BUILDER_SRCDIR="${BUILDER_SRCDIR:-${BUILDER_TOPDIR}/sources}" BUILDER_ATFDIR="${BUILDER_ATFDIR:-${BUILDER_TOPDIR}/artifacts}" diff --git a/scripts/builder/build-compile b/scripts/builder/build-compile index 99bb193..0ecad21 100755 --- a/scripts/builder/build-compile +++ b/scripts/builder/build-compile @@ -2,16 +2,14 @@ echo "compiling: ${1}" -# FIXME the CHOST is part of the BUILDER environment and should be handled -# accordingly -CHOST="i586-uplogix-linux-gnu" -CROSS_COMPILE="${CHOST}-" -ARCH="x86" -export ARCH CROSS_COMPILE CHOST +if [ -z "${CHOST}" ]; then + CROSS_COMPILE="${CHOST}-" + export CROSS_COMPILE CHOST +fi -# FIXME xcb sucks my will to live -PYTHONPATH="${BUILDER_SYSROOT}/usr/lib/python2.7/dist-packages" -export PYTHONPATH +if [ -z "${ARCH}" ]; then + export ARCH +fi # Don't pass along the builder jobcontrol data to child processes unset MAKEFLAGS |