chore: fix OSX issues

This commit is contained in:
Leonardo de Moura 2020-05-15 11:07:24 -07:00
parent 0918c8602b
commit 8a4e752f56
2 changed files with 3 additions and 3 deletions

View file

@ -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\

View file

@ -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 $<"