From f11bb7795cdd0882d4a5fe438fa19c027047a443 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Thu, 4 Nov 2010 21:38:24 -0400 Subject: [PATCH] Added per-machine $more_setup_args configuration --- collects/meta/build/build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/collects/meta/build/build b/collects/meta/build/build index a7a1f33d3c..363fdf7666 100755 --- a/collects/meta/build/build +++ b/collects/meta/build/build @@ -75,7 +75,8 @@ defbuild() { # "D" first entry is for default field values (missing default makes the field # required). Warning: an `eval "foo=\"bar\""' is used to assign values. msets "/machines/D" "workdir=/var/tmp" "moveto=" "copytobak=" \ - "configure_args=" "LDFLAGS=" "ext_lib_paths=" "renice=" + "configure_args=" "LDFLAGS=" "ext_lib_paths=" "renice=" \ + "more_setup_args=" # defbuild "ccs-solaris" "sparc-solaris" "moveto=/proj/racket" \ # "ext_lib_paths=/arch/unix/packages/openssl-0.9.7e" defbuild "pitcairn" "i386-win32" \ @@ -1103,7 +1104,7 @@ DO_BUILD() { # inputs -- releasing ## -------------------------------------------------------------------------- releasing="$1"; shift machineget platform workdir moveto copytobak \ - configure_args ext_lib_paths renice + configure_args ext_lib_paths renice more_setup_args if [[ "$renice" != "" ]]; then dont_exit _run renice "$renice" "$$"; fi @@ -1131,6 +1132,11 @@ DO_BUILD() { # inputs -- releasing export SETUP_ARGS="$SETUP_ARGS -D" fi + # additional setup args + if [[ "x$more_setup_args" != "x" ]]; then + export SETUP_ARGS="$SETUP_ARGS $more_setup_args" + fi + ## -------------------------------------------------------------------------- if [[ "$platform" = "i386-win32" ]]; then export PLTPLANETDIR="`cygpath -w \"$PLTPLANETDIR\"`"