From 107f620f4c147c3bf5d7397ccaaec17db8e9254d Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sun, 12 Nov 2017 15:23:38 -0800 Subject: [PATCH] makefile: Fix MinGW build when using windows-build libpthreadsGC2 --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 312263d5..8358f5f4 100644 --- a/makefile +++ b/makefile @@ -883,11 +883,11 @@ else $(info .) else # Version check on windows-build - WINDOWS_BUILD = $(shell findstr WINDOWS-BUILD ..\windows-build\Windows-Build_Versions.txt) + WINDOWS_BUILD = $(word 2,$(shell findstr WINDOWS-BUILD ..\windows-build\Windows-Build_Versions.txt)) ifeq (,$(WINDOWS_BUILD)) WINDOWS_BUILD = 00000000 endif - ifneq (,$(shell if 20150412 GTR $(WINDOWS_BUILD) echo old-windows-build)) + ifneq (,$(or $(shell if 20150412 GTR $(WINDOWS_BUILD) echo old-windows-build),$(and $(shell if 20171112 GTR $(WINDOWS_BUILD) echo old-windows-build),$(findstring pthreadGC2,$(PTHREADS_LDFLAGS))))) $(info .) $(info windows-build components at: $(abspath ..\windows-build)) $(info .)