diff options
Diffstat (limited to 'bootstrap.gmake')
| -rw-r--r-- | bootstrap.gmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap.gmake b/bootstrap.gmake index 1e0e8e2..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. @@ -190,13 +190,13 @@ $(out_root)/build2/b-boot$(exe): $(build2_obj) $(libbuild2_obj) $(libbutl_obj) $(CXX) -std=c++1y $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(out_root)/build2/%.b.o: $(src_root)/build2/%.cxx | $$(dir $$@). - $(CXX) -I$(libbutl) -I$(src_root) -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"$(chost)\" $(CPPFLAGS) -std=c++1y $(CXXFLAGS) -o $@ -c $< + $(CXX) -I$(libbutl) -I$(src_root) -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"$(chost)\" $(CPPFLAGS) -finput-charset=UTF-8 -std=c++1y $(CXXFLAGS) -o $@ -c $< $(out_root)/libbuild2/%.b.o: $(src_root)/libbuild2/%.cxx | $$(dir $$@). - $(CXX) -I$(libbutl) -I$(src_root) -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"$(chost)\" $(CPPFLAGS) -std=c++1y $(CXXFLAGS) -o $@ -c $< + $(CXX) -I$(libbutl) -I$(src_root) -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"$(chost)\" $(CPPFLAGS) -finput-charset=UTF-8 -std=c++1y $(CXXFLAGS) -o $@ -c $< $(libbutl_out)/%.b.o: $(libbutl)/libbutl/%.cxx | $$(dir $$@). - $(CXX) -I$(libbutl) -DBUILD2_BOOTSTRAP $(CPPFLAGS) -std=c++1y $(CXXFLAGS) -o $@ -c $< + $(CXX) -I$(libbutl) -DBUILD2_BOOTSTRAP $(CPPFLAGS) -finput-charset=UTF-8 -std=c++1y $(CXXFLAGS) -o $@ -c $< .PRECIOUS: %/. %/. : |