folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile: Fix MinGW build when using windows-build libpthreadsGC2

Browse source
This commit is contained in:
Mark Pizzolato 2017-11-12 15:23:38 -08:00
parent b45b9426c6
commit 107f620f4c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
makefile
View file

@ -883,11 +883,11 @@ else
$(info .) $(info .)
else else
# Version check on windows-build # 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)) ifeq (,$(WINDOWS_BUILD))
WINDOWS_BUILD = 00000000 WINDOWS_BUILD = 00000000
endif 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 .)
$(info windows-build components at: $(abspath ..\windows-build)) $(info windows-build components at: $(abspath ..\windows-build))
$(info .) $(info .)