diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-10-27 05:06:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-10-27 05:06:41 +0000 |
| commit | 874a000ba225840d3937f303d98432d89e869a07 (patch) | |
| tree | d66550e95d924de4db0d536eda15adf8f05497d7 /eclass | |
| parent | Fix by Nathan Brink to pull in stdint.h for uint64_t types #237600. (diff) | |
| download | gentoo-2-874a000ba225840d3937f303d98432d89e869a07.tar.gz gentoo-2-874a000ba225840d3937f303d98432d89e869a07.tar.bz2 gentoo-2-874a000ba225840d3937f303d98432d89e869a07.zip | |
set threading type to win32 for ming targets #242344 by cJ
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 13 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index a5729a5eba74..a67a348f22ba 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.10 2008/09/28 18:52:16 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.11 2008/10/27 05:06:41 vapier Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -85,6 +85,10 @@ cmake-utils_has() { _use_me_now HAVE "$@" ; } cmake-utils_src_configure() { debug-print-function $FUNCNAME $* + if has debug ${IUSE//+} && use debug ; then + append-cppflags -DNDEBUG + fi + if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then cmake-utils_src_configurein else @@ -141,11 +145,8 @@ cmake-utils_src_configureout() { # Internal use only. Common configuration options for all types of builds. _common_configure_code() { local tmp_libdir=$(get_libdir) - if has debug ${IUSE//+} && use debug; then - echo -DCMAKE_BUILD_TYPE=Debug - else - echo -DCMAKE_BUILD_TYPE=Release - fi + # CMAKE_BUILD_TYPE only modifies compiler flags, so set to None + echo -DCMAKE_BUILD_TYPE=None echo -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) echo -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) echo -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr} diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index ee819b950606..07f73b81b0bb 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.364 2008/10/24 07:30:35 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.365 2008/10/27 05:06:41 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1326,7 +1326,9 @@ gcc_do_configure() { if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then confgcc="${confgcc} --disable-bootstrap --disable-libgomp" fi - elif [[ ${CHOST} != mingw* ]] && [[ ${CHOST} != *-mingw* ]] ; then + elif [[ ${CHOST} == mingw* ]] || [[ ${CHOST} == *-mingw* ]] ; then + confgcc="${confgcc} --enable-shared --enable-threads=win32" + else confgcc="${confgcc} --enable-shared --enable-threads=posix" fi [[ ${CTARGET} == *-elf ]] && confgcc="${confgcc} --with-newlib" |