diff options
| -rw-r--r-- | Makefile.in | 19 | ||||
| -rwxr-xr-x | configure | 5 |
2 files changed, 19 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 1f2284d1..619862e6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,8 +76,8 @@ ifdef CFG_WINDOWSY CFG_RUN_TEST=PATH="$(CFG_LDPATH)" $(1) CFG_RUN_TARG=PATH="$(CFG_LDPATH)" $(1) - CFG_PATH_MUNGE := $(strip perl -i -p \ - -e 's@\\(.)@/\1@go;' \ + CFG_PATH_MUNGE := $(strip perl -i.bak -p \ + -e 's@\\(\S)@/\1@go;' \ -e 's@^/([a-zA-Z])/@\1:/@o;') ifdef CFG_FLEXLINK CFG_BOOT_NATIVE := 1 @@ -987,6 +987,7 @@ rt/%.d: rt/%.cpp $(MKFILES) $(subst $(S)src/,,$(patsubst %.cpp, %.o, $<)), \ $(RUNTIME_INCS)) $< >[email protected] $(Q)$(CFG_PATH_MUNGE) [email protected] + $(Q)rm -f [email protected] $(Q)mv [email protected] $@ rustllvm/%.d: rustllvm/%.cpp $(MKFILES) @@ -995,20 +996,25 @@ rustllvm/%.d: rustllvm/%.cpp $(MKFILES) $(subst $(S)src/,,$(patsubst %.cpp, %.o, $<)), \ $(CFG_LLVM_CXXFLAGS) $(RUSTLLVM_INCS)) $< >[email protected] $(Q)$(CFG_PATH_MUNGE) [email protected] + $(Q)rm -f [email protected] $(Q)mv [email protected] $@ %.d: %.ml $(MKFILES) @$(call E, dep: $@) $(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >[email protected] $(Q)$(CFG_PATH_MUNGE) [email protected] - $(Q)perl -i -pe "s@$(S)src/@@go" [email protected] + $(Q)rm -f [email protected] + $(Q)perl -i.bak -pe "s@$(S)src/@@go" [email protected] + $(Q)rm -f [email protected] $(Q)mv [email protected] $@ %.d: %.mli $(MKFILES) @$(call E, dep: $@) $(Q)ocamldep$(OPT) -slash $(BOOT_ML_DEP_INCS) $< >[email protected] $(Q)$(CFG_PATH_MUNGE) [email protected] - $(Q)perl -i -pe "s@$(S)src/@@go" [email protected] + $(Q)rm -f [email protected] + $(Q)perl -i.bak -pe "s@$(S)src/@@go" [email protected] + $(Q)rm -f [email protected] $(Q)mv [email protected] $@ ifneq ($(MAKECMDGOALS),clean) @@ -1029,6 +1035,7 @@ boot/$(CFG_STDLIB).d: $(STDLIB_CRATE) $(STDLIB_INPUTS) \ @$(call E, dep: $@) $(BOOT) -o $(patsubst %.d,%,$@) -shared -rdeps $< >[email protected] $(Q)$(CFG_PATH_MUNGE) [email protected] + $(Q)rm -f [email protected] $(Q)mv [email protected] $@ stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \ @@ -1036,12 +1043,14 @@ stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \ @$(call E, dep: $@) $(BOOT) -o $(patsubst %.d,%,$@) -shared -rdeps $< >[email protected] $(Q)$(CFG_PATH_MUNGE) [email protected] + $(Q)rm -f [email protected] $(Q)mv [email protected] $@ %.d: %.rc $(MKFILES) boot/rustboot$(X) @$(call E, dep: $@) $(BOOT) -o $(patsubst %.d,%,$@) -rdeps $< >[email protected] $(Q)$(CFG_PATH_MUNGE) [email protected] + $(Q)rm -f [email protected] $(Q)mv [email protected] $@ ifneq ($(MAKECMDGOALS),clean) @@ -1149,5 +1158,5 @@ clean: bc o s exe dSYM, \ $(wildcard test/*/*.$(ext) test/bench/*/*.$(ext))) $(Q)rm -Rf $(foreach ext, \ - aux cp fn ky log pdf html pg toc tp vr cps texi \ + aux cp fn ky log pdf html pg toc tp vr cps texi, \ $(wildcard doc/*.$(ext))) @@ -179,6 +179,11 @@ putvar CFG_LLVM_CXXFLAGS putvar CFG_LLVM_LDFLAGS putvar CFG_LLVM_LIBS +# Munge any paths that appear in config.mk back to posix-y +perl -i.bak -p -e 's@ ([a-zA-Z]):\\@ /\1/@go;' \ + -e 's@\\@/@go;' config.mk +rm -f config.mk.bak + copy ${CFG_SRC_DIR}Makefile.in ./Makefile echo "configure: complete" |