diff --git a/src/stdlib.make.in b/src/stdlib.make.in index 11462b2358..9a861bc9c0 100644 --- a/src/stdlib.make.in +++ b/src/stdlib.make.in @@ -8,7 +8,7 @@ stdlib: # Otherwise, we build the library with `leanmake`. We rebuild it (`MORE_DEPS`) whenever the compiler has changed. +if [ ${STAGE} == 0.5 ]; then\ mkdir -p "${LIB}/lean";\ - cp -rlf $$(find "${PREV_STAGE}/lib/lean" -mindepth 1 -maxdepth 1 -not -name libleancpp.a) "${LIB}/lean";\ + cp -rf $$(find "${PREV_STAGE}/lib/lean" -mindepth 1 -maxdepth 1 -not -name libleancpp.a) "${LIB}/lean";\ else\ "${LEAN_BIN}/leanmake" lib\ PKG=Init\ diff --git a/stage0/src/Makefile.in b/stage0/src/Makefile.in index 609fe38161..82328de09f 100644 --- a/stage0/src/Makefile.in +++ b/stage0/src/Makefile.in @@ -35,8 +35,8 @@ $(OLEAN_OUT)/$(PKG) $(LIB_OUT) $(BIN_OUT): $(TEMP_OUT)/%.depend: %.lean | $(OLEAN_OUT)/$(PKG) @mkdir -p "$(TEMP_OUT)/$(*D)" # use separate assignment to ensure failure propagation -# convert file separators and newlines on Windows - @deps=`lean --deps $< | sed 's!\\\\!/!g;s/\\r//'`; echo $(OLEAN_OUT)/$(<:.lean=.olean): $$deps > $@ +# convert path separators and newlines on Windows + @deps=`lean --deps $< | tr '\\\\' / | tr -d '\\r'`; echo $(OLEAN_OUT)/$(<:.lean=.olean): $$deps > $@ $(OLEAN_OUT)/%.olean: %.lean $(TEMP_OUT)/%.depend $(MORE_DEPS) @echo "[ ] Building $<"