Skip to content

Commit

Permalink
enbale MXE_GCC_THREADS and allow target spec <triplet>.<link>.<threads>
Browse files Browse the repository at this point in the history
* enables optional c++11 <thread>, <mutex>, and <future> 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
  • Loading branch information
tonytheodore committed Oct 27, 2015
1 parent 59eda84 commit fcad34c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/gcc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)' \
Expand Down

0 comments on commit fcad34c

Please sign in to comment.