Have a default "" platform so kauai can still be used to make the dmgs.
(This is just a hack, $platform should really be used only in the build
functions instead of at the toplevel.)
(cherry picked from commit 52382442f0
)
This commit is contained in:
parent
060ab396a4
commit
52e609ff6a
|
@ -74,7 +74,7 @@ defbuild() {
|
||||||
# entries, with misc fields set. Machines and platforms must be unique. The
|
# entries, with misc fields set. Machines and platforms must be unique. The
|
||||||
# "D" first entry is for default field values (missing default makes the field
|
# "D" first entry is for default field values (missing default makes the field
|
||||||
# required). Warning: an `eval "foo=\"bar\""' is used to assign values.
|
# required). Warning: an `eval "foo=\"bar\""' is used to assign values.
|
||||||
msets "/machines/D" "workdir=/var/tmp" "moveto=" "copytobak=" \
|
msets "/machines/D" "platform=" "workdir=/var/tmp" "moveto=" "copytobak=" \
|
||||||
"configure_args=" "LDFLAGS=" "ext_lib_paths=" "renice=" \
|
"configure_args=" "LDFLAGS=" "ext_lib_paths=" "renice=" \
|
||||||
"more_setup_args=" "test_gui="
|
"more_setup_args=" "test_gui="
|
||||||
# defbuild "ccs-solaris" "sparc-solaris" "moveto=/proj/racket" \
|
# defbuild "ccs-solaris" "sparc-solaris" "moveto=/proj/racket" \
|
||||||
|
@ -2205,9 +2205,11 @@ if [[ "$1" = "--dispatch" ]]; then
|
||||||
init_repo_vars # set the repository variables according to the env vars
|
init_repo_vars # set the repository variables according to the env vars
|
||||||
machineget platform # set the global platform for dependable script pieces
|
machineget platform # set the global platform for dependable script pieces
|
||||||
if [[ "${machine:-$workmachine}" != "$workmachine" ]]; then
|
if [[ "${machine:-$workmachine}" != "$workmachine" ]]; then
|
||||||
machine_suffix=" [$machine($platform)]"
|
if [[ "$platform" = "" ]]; then machine_suffix=" [$machine]"
|
||||||
|
else machine_suffix=" [$machine($platform)]"; fi
|
||||||
fi
|
fi
|
||||||
show "Working on $machine($platform)"
|
if [[ "$platform" = "" ]]; then show "Working on $machine"
|
||||||
|
else show "Working on $machine($platform)"; fi
|
||||||
show "Dispatching to $go($*)"
|
show "Dispatching to $go($*)"
|
||||||
"$go" "$@"
|
"$go" "$@"
|
||||||
show "Done working on $machine($platform)"
|
show "Done working on $machine($platform)"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user