diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-12-01 20:58:53 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-01 20:58:53 +0000 |
| commit | 0beac18c7aa0a2959b63cb662ebaaeb1f443f9f5 (patch) | |
| tree | ea7b7d1a7ac6b5c2597c819c7464ff36daf0f086 /bootstrap.1 | |
| parent | 5da12b112f20e3db16dc4b04881284a96547c259 (diff) | |
overcome aborted download problems
Previously if we aborted the download, it would delete dmake/dmake
which would then simply not be re-built, since we were checking for
the version in the solver in the bootstrap script - which would still
be there.
Diffstat (limited to 'bootstrap.1')
| -rw-r--r-- | bootstrap.1 | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/bootstrap.1 b/bootstrap.1 index 304f41cb17cd..fa5e501d90cd 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -14,9 +14,7 @@ export EXEEXT # Build dmake if test "$BUILD_DMAKE" != "NO"; then - - if test ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then - + if test ! -x "$SRC_ROOT/dmake/dmake"; then cd "$SRC_ROOT/dmake" || exit # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler @@ -42,14 +40,9 @@ if test "$BUILD_DMAKE" != "NO"; then echo "dmake has been successfully built" cd .. - else - - echo "" - echo "dmake present in $SOLARENV/$OUTPATH/bin/dmake$EXEEXT" - + echo "dmake/dmake already built" fi - fi mkdir -p "$SOLARENV/$OUTPATH/bin" |