procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix make bootstrap for native compilation

Browse source 
Add Makefile target native-compile-clean removing all eln output
folders.

This is also triggered by make bootstrap to perform a clean bootstrap.

Also revert some modification of the build system against master not
effective anymore with the new directory layout.
This commit is contained in:
Andrea Corallo 2020-03-14 10:57:34 +00:00
parent 144e8f64b6
commit dab8dd836c
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lisp/Makefile.in
View file

@ -356,6 +356,13 @@ compile-main: gen-lisp compile-clean
$(MAKE) compile-targets TARGETS="$$chunk"; \ $(MAKE) compile-targets TARGETS="$$chunk"; \
done done
.PHONY: native-compile-clean
native-compile-clean:
# Erase all eln output compilation folders.
ifeq ($(HAVE_NATIVE_COMP),yes)
find $(lisp) -regex ".*/eln-.*-[0-9a-z]+\\'" -type d | xargs rm -rf
endif
.PHONY: compile-clean .PHONY: compile-clean
# Erase left-over .elc files that do not have a corresponding .el file. # Erase left-over .elc files that do not have a corresponding .el file.
compile-clean: compile-clean:
@ -366,10 +373,6 @@ compile-clean:
echo rm "$${el}c"; \ echo rm "$${el}c"; \
rm "$${el}c"; \ rm "$${el}c"; \
fi; \ fi; \
if test -f "$$el" || test ! -f "$${el}n"; then :; else \
echo rm "$${el}n"; \
rm "$${el}n"; \
fi; \
done done
.PHONY: gen-lisp leim semantic .PHONY: gen-lisp leim semantic
@ -396,7 +399,7 @@ compile: $(LOADDEFS) autoloads compile-first
# Compile all Lisp files. This is like 'compile' but compiles files # Compile all Lisp files. This is like 'compile' but compiles files
# unconditionally. Some files don't actually get compiled because they # unconditionally. Some files don't actually get compiled because they
# set the local variable no-byte-compile. # set the local variable no-byte-compile.
compile-always: compile-always: native-compile-clean
find $(lisp) -name '*.elc' $(FIND_DELETE) find $(lisp) -name '*.elc' $(FIND_DELETE)
$(MAKE) compile $(MAKE) compile
@ -486,8 +489,8 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el
.PHONY: bootstrap-clean distclean maintainer-clean extraclean .PHONY: bootstrap-clean distclean maintainer-clean extraclean
bootstrap-clean: bootstrap-clean: native-compile-clean
find $(lisp) -regex '.*\.elc\|.*\.eln' $(FIND_DELETE) find $(lisp) -name '*.elc' $(FIND_DELETE)
rm -f $(AUTOGENEL) rm -f $(AUTOGENEL)
distclean: distclean:

2
src/Makefile.in
View file

@ -327,7 +327,7 @@ GMP_LIB = @GMP_LIB@
GMP_OBJ = @GMP_OBJ@ GMP_OBJ = @GMP_OBJ@
LIBGCCJIT = @LIBGCCJIT_LIB@ LIBGCCJIT = @LIBGCCJIT_LIB@
## dynlib.o comp.o if native compiler is enabled, else empty ## dynlib.o comp.o if native compiler is enabled, otherwise empty.
COMP_OBJ = @COMP_OBJ@ COMP_OBJ = @COMP_OBJ@
RUN_TEMACS = ./temacs RUN_TEMACS = ./temacs