~ chicken-core (chicken-5) e88cc7acc88f567355e9e3dedae63e99e888515c
commit e88cc7acc88f567355e9e3dedae63e99e888515c
Author: Peter Bex <peter.bex@xs4all.nl>
AuthorDate: Sat Jun 7 14:03:09 2014 +0200
Commit: Peter Bex <peter.bex@xs4all.nl>
CommitDate: Sat Jun 7 14:03:09 2014 +0200
Fix recursive Make invocation for boot-chicken and installation when relinking
diff --git a/rules.make b/rules.make
index e9bf3b34..05a1a49d 100644
--- a/rules.make
+++ b/rules.make
@@ -350,7 +350,7 @@ install-bin:
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(IMPORT_LIBRARIES:%=%.so)
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(IMPORT_LIBRARIES:%=%.import.so)
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(LIBCHICKEN_SO_FILE)
- "$(MAKE)" -f $(SRCDIR)Makefile.$(PLATFORM) CONFIG=$(CONFIG) NEEDS_RELINKING=no RUNTIME_LINKER_PATH="$(LIBDIR)" install-bin
+ "$(MAKE)" PLATFORM=$(PLATFORM) CONFIG=$(CONFIG) NEEDS_RELINKING=no RUNTIME_LINKER_PATH="$(LIBDIR)" install-bin
# Damn. What was this for, again?
#
# $(MAKE_WRITABLE_COMMAND) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE)
@@ -673,11 +673,11 @@ bench: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)$(EXE
.PHONY: boot-chicken
boot-chicken:
- "$(MAKE)" -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
+ "$(MAKE)" PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
CHICKEN=$(CHICKEN) PROGRAM_SUFFIX=-boot-stage1 STATICBUILD=1 \
C_COMPILER_OPTIMIZATION_OPTIONS="$(C_COMPILER_OPTIMIZATION_OPTIONS)" C_HACKED_APPLY= BUILDING_CHICKEN_BOOT=1 \
confclean chicken-boot-stage1$(EXE)
- "$(MAKE)" -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
+ "$(MAKE)" PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
CHICKEN=.$(SEP)chicken-boot-stage1$(EXE) PROGRAM_SUFFIX=-boot \
STATICBUILD=1 C_COMPILER_OPTIMIZATION_OPTIONS="$(C_COMPILER_OPTIMIZATION_OPTIONS)" \
touchfiles chicken-boot$(EXE) confclean
Trap