diff options
| author | Graydon Hoare <[email protected]> | 2011-03-16 17:36:49 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-03-16 17:36:49 -0700 |
| commit | 320ac6b8eba10b51ba10443198d319b8ea0a657d (patch) | |
| tree | ffc5dbcc5db117b56e8a070d7f0aa5013ff34ef8 /src | |
| parent | Remove uses of 'break' in std lib; rustc doesn't support it yet, this is easi... (diff) | |
| download | rust-320ac6b8eba10b51ba10443198d319b8ea0a657d.tar.xz rust-320ac6b8eba10b51ba10443198d319b8ea0a657d.zip | |
Teach configure.sh to probe paths, factor a bit.
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/configure.sh | 74 |
1 files changed, 48 insertions, 26 deletions
diff --git a/src/configure.sh b/src/configure.sh index eb741680..03678e01 100644..100755 --- a/src/configure.sh +++ b/src/configure.sh @@ -3,37 +3,59 @@ CFG_SRC_DIR=${0%${0##*/}} CFG_BUILD_DIR=$PWD -CFG_OSTYPE=$(uname -s) -CFG_CPUTYPE=$(uname -m) - -echo "configuring on $CFG_CPUTYPE $CFG_OSTYPE" - -echo "setting up build directories" -for i in boot/{fe,me,be,driver,util} \ - rt/{isaac,bigint,sync,test} \ - stage{0,1,2} \ - test/{run-pass,compile-{pass,fail}} +echo "configure: recreating config.mk" +echo '' >config.mk + +echo "configure: making directories" +for i in \ + boot/fe boot/me boot/be boot/driver boot/util \ + rt/isaac rt/bigint rt/sync rt/test \ + stage0 stage1 stage2 \ + test/run-pass test/compile-pass test/compile-fail do mkdir -p -v $i done -CFG_VALGRIND=$(sh which valgrind) -CFG_OCAMLC_OPT=$(sh which ocamlc.opt) - -echo "copying Makefile" +echo "configure: copying Makefile" cp -v ${CFG_SRC_DIR}Makefile.in ./Makefile -echo "writing config.mk" -cat >config.mk <<EOF +putvar() { + local T + eval T=\$$1 + printf "%-20s := %s\n" $1 $T + printf "%-20s := %s\n" $1 $T >>config.mk +} + +probe() { + local V=$1 + local P=$2 + local T + T=$(which $P 2>&1) + if [ $? -ne 0 ] + then + T="" + fi + eval $V=\$T + putvar $V +} + +echo "configure: inspecting environment" -CFG_OSTYPE := $CFG_OSTYPE -CFG_CPUTYPE := $CFG_CPUTYPE -CFG_SRC_DIR := $CFG_SRC_DIR -CFG_BUILD_DIR := $CFG_BUILD_DIR - -CFG_VALGRIND := $CFG_VALGRIND -CFG_OCAMLC_OPT := $CFG_OCAMLC_OPT - -EOF +CFG_OSTYPE=$(uname -s) +CFG_CPUTYPE=$(uname -m) -echo "configured ok" +putvar CFG_SRC_DIR +putvar CFG_BUILD_DIR +putvar CFG_OSTYPE +putvar CFG_CPUTYPE + +echo "configure: looking for programs" +probe CFG_VALGRIND valgrind +probe CFG_OCAMLC ocamlc +probe CFG_OCAMLC_OPT ocamlc.opt +probe CFG_OCAMLOPT ocamlopt +probe CFG_OCAMLOPT_OPT ocamlopt.opt +probe CFG_FLEXLINK flexlink +probe CFG_LLVM_CONFIG llvm-config + +echo "configure: complete" |