From b5b758a40a79a305e0bcdf64b0956469bbfd84ad Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 12 Jul 2022 12:37:06 +0200 Subject: Use -pthread instead of -lpthread in bootstrap scripts/makefile --- bootstrap-mingw.bat | 2 +- bootstrap.gmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap-mingw.bat b/bootstrap-mingw.bat index cfd9d7c..5638659 100644 --- a/bootstrap-mingw.bat +++ b/bootstrap-mingw.bat @@ -107,7 +107,7 @@ for %%d in (%src%) do ( ) echo on -%cxx% -I%libbutl% -I. -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"x86_64-w64-mingw32\" %ops% -o build2\b-boot.exe %r% -limagehlp +%cxx% -I%libbutl% -I. -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"x86_64-w64-mingw32\" %ops% -o build2\b-boot.exe %r% -pthread -limagehlp @echo off if errorlevel 1 goto error diff --git a/bootstrap.gmake b/bootstrap.gmake index e5ab285..a2c9779 100644 --- a/bootstrap.gmake +++ b/bootstrap.gmake @@ -51,7 +51,7 @@ ifeq ($(OS),Windows_NT) ifneq ($(filter %-w64-mingw32,$(target)),) host := x86_64-w64-mingw32 chost := $(host) - override LIBS += -limagehlp + override LIBS += -pthread -limagehlp else ifneq ($(filter %-windows-msvc,$(target)),) host := x86_64-microsoft-win32-msvc chost := $(host) @@ -65,7 +65,7 @@ ifeq ($(OS),Windows_NT) $(error unsupported target $(target)) endif else - override LIBS += -lpthread + override LIBS += -pthread endif # Remove all the built-in rules, enable second expansion, etc. -- cgit v1.1