diff --git a/src/do_build_druntime.sh b/src/do_build_druntime.sh index 7ad6784..5d12158 100755 --- a/src/do_build_druntime.sh +++ b/src/do_build_druntime.sh @@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then fi if [ "$2" != "Win_32" -a "$2" != "Win_32_64" ]; then - $makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../druntime-build.log 2>&1 + $makecmd DMD=../dmd/generated/*/release/$COMPILER_MODEL/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../druntime-build.log 2>&1 if [ $? -ne 0 ]; then echo -e "\tfailed to install $repo" exit 1 diff --git a/src/do_build_phobos.sh b/src/do_build_phobos.sh index 495559b..72d4ed9 100755 --- a/src/do_build_phobos.sh +++ b/src/do_build_phobos.sh @@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then fi if [ "$2" != "Win_32" -a "$2" != "Win_32_64" ]; then - $makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../phobos-build.log 2>&1 + $makecmd DMD=../dmd/generated/*/release/$COMPILER_MODEL/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../phobos-build.log 2>&1 if [ $? -ne 0 ]; then echo -e "\tfailed to install $repo" exit 1 diff --git a/src/do_html_phobos.sh b/src/do_html_phobos.sh index d8f0224..e506de8 100755 --- a/src/do_html_phobos.sh +++ b/src/do_html_phobos.sh @@ -14,7 +14,7 @@ echo -e "\tgenerating html" cd $1/phobos -DMD=../dmd/src/dmd +DMD=../dmd/generated/*/release/$COMPILER_MODEL/dmd DOC=../web/2.0 if [ "${2:0:4}" == "Win_" ]; then diff --git a/src/do_test_druntime.sh b/src/do_test_druntime.sh index 6f7f61b..7e5e018 100755 --- a/src/do_test_druntime.sh +++ b/src/do_test_druntime.sh @@ -16,7 +16,7 @@ if [ "$2" == "stub" ]; then exit 0 fi -$makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../druntime-unittest.log 2>&1 +$makecmd DMD=../dmd/generated/*/release/$COMPILER_MODEL/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../druntime-unittest.log 2>&1 if [ $? -ne 0 ]; then echo -e "\tdruntime unittest failed to build" exit 1 diff --git a/src/do_test_phobos.sh b/src/do_test_phobos.sh index fea8774..4491880 100755 --- a/src/do_test_phobos.sh +++ b/src/do_test_phobos.sh @@ -19,7 +19,7 @@ case "$2" in ;; esac -$makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../phobos-unittest.log 2>&1 +$makecmd DMD=../dmd/generated/*/release/$COMPILER_MODEL/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../phobos-unittest.log 2>&1 if [ $? -ne 0 ]; then echo -e "\tphobos tests failed" exit 1