From: Anton Korobeynikov Date: Sat, 16 Jan 2010 14:06:58 +0000 (+0000) Subject: Provide magic define on mingw to not generate inline variants of ctyper functions. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2b02b43eb81e5dbbf81238f6fd705405e7f6b2d8;p=oota-llvm.git Provide magic define on mingw to not generate inline variants of ctyper functions. Otherwise we'll end with random cyclic deps between libraries due to this. Proposed by Gianluigi Tiesi! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93635 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/Makefile.rules b/Makefile.rules index 49ecb1e2d86..5987e4889ce 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -439,6 +439,17 @@ else endif endif +ifeq ($(HOST_OS),MingW) + # Work around PR4957 + CPP.Defines += -D__NO_CTYPE_INLINE + ifeq ($(LLVM_CROSS_COMPILING),1) + # Work around http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525016 + ifdef TOOLNAME + LD.Flags += -Wl,--allow-multiple-definition + endif + endif +endif + CXX.Flags += -Woverloaded-virtual CPP.BaseFlags += $(CPP.Defines) AR.Flags := cru @@ -457,15 +468,6 @@ ifeq ($(ARCH),Alpha) LD.Flags += -Wl,--no-relax endif -ifeq ($(HOST_OS),MingW) - ifeq ($(LLVM_CROSS_COMPILING),1) - # Work around http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525016 - ifdef TOOLNAME - LD.Flags += -Wl,--allow-multiple-definition - endif - endif -endif - ifdef ENABLE_EXPENSIVE_CHECKS # GNU libstdc++ uses RTTI if you define _GLIBCXX_DEBUG, which we did above. # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40160