For Windows builds, add logging of build tools (path and version) for…

… better CI debugging.
OpenSmalltalk · May 2, 2023 · cb725d2 · cb725d2
1 parent 6316198
commit cb725d2
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 6 deletions.
diff --git a/building/win32x86/common/Makefile b/building/win32x86/common/Makefile
@@ -140,7 +140,7 @@ INCLUDES:= -I. -I$(VMSRCDIR) -I$(WIN32DIR) -I$(CROSSDIR) $(XINC)
 # Common build rules
 #
 
-default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) nukelibs $(APPPOST)
+default: print-tools print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) nukelibs $(APPPOST)
 
 svnver:
 	echo $(RC) $(RCFLAGS)
@@ -212,6 +212,21 @@ print-objects:
 	$(info VMOBJ=$(VMOBJ))
 	$(info -----------------------------------------------------)
 
+.PHONY : print-tools
+
+print-tools:
+	$(info ---------------- Build tools ------------------------)
+	$(info CC	$(shell which $(CC))	$(shell $(CC) --version 2> /dev/null | head -n 1))
+	$(info LD	$(shell which $(LD))	$(shell $(LD) --version 2> /dev/null | head -n 1))
+	$(info CP	$(shell which $(CP))		$(shell $(CP) --version 2> /dev/null | head -n 1))
+	$(info RM	$(shell which $(RM))		$(shell $(RM) --version 2> /dev/null | head -n 1))
+	$(info AR	$(shell which $(AR))		$(shell $(AR) --version 2> /dev/null | head -n 1))
+	$(info NM	$(shell which $(NM))		$(shell $(NM) --version 2> /dev/null | head -n 1))
+	$(info DLLTOOL	$(shell which $(DLLTOOL))	$(shell $(DLLTOOL) --version 2> /dev/null | head -n 1))
+	$(info DLLWRAP	$(shell which $(DLLWRAP))	$(shell $(DLLWRAP) --version 2> /dev/null | head -n 1))
+	$(info RC	$(shell which $(RC))	$(shell $(RC) --version 2> /dev/null | head -n 1))
+	$(info -----------------------------------------------------)
+
 ignore := $(addsuffix .%, $(basename $(wildcard $(BUILD)/vm/*.ignore)))
 
 mingw32ver.exe: $(WIN32UTILDIR)/mingw32ver.c

diff --git a/building/win32x86/common/Makefile.plugin b/building/win32x86/common/Makefile.plugin
@@ -142,7 +142,7 @@ ifeq ($(realpath $(PREREQUISITES)),$(abspath $(PREREQUISITES)))
 
 $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ)
 	-$(RM) $(PLUGINLIB)
-	$(AR) $(PLUGINLIB) $(LIBOBJ)
+	$(AR) $(ARFLAGS) $(PLUGINLIB) $(LIBOBJ)
 
 $(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ)
 	$(DLLTOOL) \

diff --git a/building/win32x86/common/Makefile.tools b/building/win32x86/common/Makefile.tools
@@ -79,7 +79,8 @@ STDLIBS:= -lddraw -ldinput -lopengl32 -lws2_32 -lcomdlg32 -lole32 -lwinmm \
 #############################################################################
 # Tools to use
 #
-AR:= $(TOOLPREFIX)ar rc
+AR:= $(TOOLPREFIX)ar
+ARFLAGS:= rc
 CP:= cp
 RM:= rm
 SED:=sed

diff --git a/building/win64x64/common/Makefile b/building/win64x64/common/Makefile
@@ -140,7 +140,7 @@ INCLUDES:= -I. -I$(VMSRCDIR) -I$(WIN32DIR) -I$(CROSSDIR) $(XINC)
 # Common build rules
 #
 
-default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) nukelibs $(APPPOST)
+default: print-tools print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) nukelibs $(APPPOST)
 
 svnver:
 	echo $(RC) $(RCFLAGS)
@@ -212,6 +212,21 @@ print-objects:
 	$(info VMOBJ=$(VMOBJ))
 	$(info -----------------------------------------------------)
 
+.PHONY : print-tools
+
+print-tools:
+	$(info ---------------- Build tools ------------------------)
+	$(info CC	$(shell which $(CC))	$(shell $(CC) --version 2> /dev/null | head -n 1))
+	$(info LD	$(shell which $(LD))	$(shell $(LD) --version 2> /dev/null | head -n 1))
+	$(info CP	$(shell which $(CP))		$(shell $(CP) --version 2> /dev/null | head -n 1))
+	$(info RM	$(shell which $(RM))		$(shell $(RM) --version 2> /dev/null | head -n 1))
+	$(info AR	$(shell which $(AR))		$(shell $(AR) --version 2> /dev/null | head -n 1))
+	$(info NM	$(shell which $(NM))		$(shell $(NM) --version 2> /dev/null | head -n 1))
+	$(info DLLTOOL	$(shell which $(DLLTOOL))	$(shell $(DLLTOOL) --version 2> /dev/null | head -n 1))
+	$(info DLLWRAP	$(shell which $(DLLWRAP))	$(shell $(DLLWRAP) --version 2> /dev/null | head -n 1))
+	$(info RC	$(shell which $(RC))	$(shell $(RC) --version 2> /dev/null | head -n 1))
+	$(info -----------------------------------------------------)
+
 ignore := $(addsuffix .%, $(basename $(wildcard $(BUILD)/vm/*.ignore)))
 
 mingw32ver.exe: $(WIN32UTILDIR)/mingw32ver.c

diff --git a/building/win64x64/common/Makefile.plugin b/building/win64x64/common/Makefile.plugin
@@ -142,7 +142,7 @@ ifeq ($(realpath $(PREREQUISITES)),$(abspath $(PREREQUISITES)))
 
 $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ)
 	-$(RM) $(PLUGINLIB)
-	$(AR) $(PLUGINLIB) $(LIBOBJ)
+	$(AR) $(ARFLAGS) $(PLUGINLIB) $(LIBOBJ)
 
 $(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ)
 	$(DLLTOOL) \

diff --git a/building/win64x64/common/Makefile.tools b/building/win64x64/common/Makefile.tools
@@ -86,7 +86,8 @@ STDLIBS:= -lddraw -ldinput -lopengl32 -lws2_32 -lcomdlg32 -lole32 -lwinmm \
 #############################################################################
 # Tools to use
 #
-AR:= $(TOOLPREFIX)ar rc
+AR:= $(TOOLPREFIX)ar
+ARFLAGS:= rc
 CP:= cp
 RM:= rm
 SED:=sed