Fix image leak checker builds on macOS (make sure it can build if it's

the first thing built).
OpenSmalltalk · Aug 28, 2024 · 1c75cb2 · 1c75cb2
1 parent 71e0893
commit 1c75cb2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/building/macos32x86/common/Makefile.vm b/building/macos32x86/common/Makefile.vm
@@ -129,11 +129,6 @@ XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
 CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(DEFS) $(XDEFS)
 INCLUDES:= $(addprefix -I,. $(SRCDIRS))
 
-#############################################################################
-# Linker settings
-#
-LD:=	 gcc
-
 #############################################################################
 # Ensure version control info is up-to-date, and extract it from the file.
 #
@@ -242,8 +237,8 @@ else
 			-o $(OBJDIR)/$(VM) $(VMOBJ) $(filter-out $(call ignore), $(LIBS))
 endif
 
-$(OBJDIR)/validImage: $(OBJDIR)/validImage.o $(OBJDIR)/sqUnixSpurMemory.o $(OBJDIR)/sqHeapMap.o
-	$(LD) -arch $(TARGET_ARCH) -o $@ $^
+$(OBJDIR)/validImage: $(OBJDIR) $(OBJDIR)/validImage.o $(OBJDIR)/sqUnixSpurMemory.o $(OBJDIR)/sqHeapMap.o
+	$(LD) -arch $(TARGET_ARCH) -o $@ $(filter %.o,$^)
 
 $(OBJDIR):
 	@-mkdir -p $(BLDDIR)

diff --git a/building/macos64ARMv8/common/Makefile.vm b/building/macos64ARMv8/common/Makefile.vm
@@ -136,11 +136,6 @@ XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
 CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(DEFS) $(XDEFS)
 INCLUDES:= $(addprefix -I,. $(SRCDIRS))
 
-#############################################################################
-# Linker settings
-#
-LD:=	 gcc
-
 #############################################################################
 # Ensure version control info is up-to-date, and extract it from the file.
 #
@@ -256,8 +251,8 @@ else
 			-o $(OBJDIR)/$(VM) $(VMOBJ) $(filter-out $(call ignore), $(LIBS))
 endif
 
-$(OBJDIR)/validImage: $(OBJDIR)/validImage.o $(OBJDIR)/sqUnixSpurMemory.o $(OBJDIR)/sqHeapMap.o
-	$(LD) -arch $(TARGET_ARCH) -o $@ $^
+$(OBJDIR)/validImage: $(OBJDIR) $(OBJDIR)/validImage.o $(OBJDIR)/sqUnixSpurMemory.o $(OBJDIR)/sqHeapMap.o
+	$(LD) -arch $(TARGET_ARCH) -o $@ $(filter %.o,$^)
 
 $(OBJDIR):
 	@-mkdir -p $(BLDDIR)

diff --git a/building/macos64x64/common/Makefile.vm b/building/macos64x64/common/Makefile.vm
@@ -136,11 +136,6 @@ XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
 CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(DEFS) $(XDEFS)
 INCLUDES:= $(addprefix -I,. $(SRCDIRS))
 
-#############################################################################
-# Linker settings
-#
-LD:=	 gcc
-
 #############################################################################
 # Ensure version control info is up-to-date, and extract it from the file.
 #
@@ -178,13 +173,13 @@ debug:
 	$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug $(@,debug=) default
 
 productilc:
-	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) CONFIGURATION=product build/vm/validImage
+	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) CONFIGURATION=product validImage
 
 assertilc:
-	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) CONFIGURATION=assert buildast/vm/validImage
+	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) CONFIGURATION=assert validImage
 
 debugilc:
-	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) CONFIGURATION=debug builddbg/vm/validImage
+	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) CONFIGURATION=debug validImage
 
 cleanallvm:	cleandeps cleanvm cleanvmast cleanvmdbg cleangv
 
@@ -256,8 +251,8 @@ else
 			-o $(OBJDIR)/$(VM) $(VMOBJ) $(filter-out $(call ignore), $(LIBS))
 endif
 
-$(OBJDIR)/validImage: $(OBJDIR)/validImage.o $(OBJDIR)/sqUnixSpurMemory.o $(OBJDIR)/sqHeapMap.o
-	$(LD) -arch $(TARGET_ARCH) -o $@ $^
+$(OBJDIR)/validImage: $(OBJDIR) $(OBJDIR)/validImage.o $(OBJDIR)/sqUnixSpurMemory.o $(OBJDIR)/sqHeapMap.o
+	$(LD) -arch $(TARGET_ARCH) -o $@ $(filter %.o,$^)
 
 $(OBJDIR):
 	@-mkdir -p $(BLDDIR)