From 30b7b7164f9763f206dedb0929cbe3a510ad5ab9 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 27 Oct 2015 14:14:43 +1100 Subject: enbale MXE_GCC_THREADS and allow target spec .. * enables optional c++11 , , and in libgcc * avoid double build advice: http://sigrok.org/gitweb/?p=sigrok-util.git;a=blob;f=cross-compile/mingw/README;h=248af546f939a81855dda33142d834eecf2979c2;hb=HEAD#l44 * not heavily tested but should be released for feedback --- Makefile | 5 ++++- src/gcc.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 12ceff7..10757ee 100644 --- a/Makefile +++ b/Makefile @@ -76,6 +76,9 @@ MXE_CONFIGURE_OPTS = \ --enable-static --disable-shared , \ --disable-static --enable-shared ) +MXE_GCC_THREADS = \ + $(if $(findstring posix,$(TARGET)),posix,win32) + # Append these to the "make" and "make install" steps of autotools packages # in order to neither build nor install unwanted binaries, manpages, # infopages and API documentation (reduces build time and disk space usage). @@ -360,7 +363,7 @@ define TARGET_RULE $(if $(findstring i686-pc-mingw32,$(1)), $(error Deprecated target specified: "$(1)". Please use \ i686-w64-mingw32.[$(subst $(space),|,$(MXE_LIB_TYPES))] instead)) - $(if $(filter $(1),$(MXE_TARGET_LIST) $(BUILD) $(MXE_TRIPLETS)),, + $(if $(filter $(addsuffix %,$(MXE_TARGET_LIST) $(BUILD) $(MXE_TRIPLETS)),$(1)),, $(error Invalid target specified: "$(1)")) $(if $(findstring 1,$(words $(subst ., ,$(filter-out $(BUILD),$(1))))), @echo diff --git a/src/gcc.mk b/src/gcc.mk index 37976c3..4e7bbf7 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -38,7 +38,7 @@ define $(PKG)_CONFIGURE --disable-multilib \ --without-x \ --disable-win32-registry \ - --enable-threads=win32 \ + --enable-threads=$(MXE_GCC_THREADS) \ --enable-libgomp \ --with-gmp='$(PREFIX)/$(BUILD)' \ --with-isl='$(PREFIX)/$(BUILD)' \ -- cgit v0.12