diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-21 11:25:01 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-21 11:26:33 +0200 |
| commit | 05d6145307cfdadc316c434a24aa86729974c028 (patch) | |
| tree | e38950bf5d7479b2d6433fa05c1f8b8ba985f4b0 | |
| parent | 28253b4d826a8a008349fa66c902028e3f5a907b (diff) | |
WaE: option "-fno-default-inline" is valid for C++/ObjC++ but not for C
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 3d691ccd5ac6..80c24bafe232 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -38,8 +38,8 @@ # CFLAGS from environment override debug/optimization flags ifeq ($(gb_DEBUGLEVEL),2) CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) -CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) -OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) +CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS) +OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS) else CFLAGS ?= $(gb_COMPILEROPTFLAGS) CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 834f5e9a65d8..7d947edcaf4c 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -101,7 +101,8 @@ else GGDB2=-g2 endif -gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline -fno-default-inline +gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline +gb_DEBUG_CXXFLAGS := -fno-default-inline gb_STDLIBS := \ mingwthrd \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 9c2b4051b58e..5fb5f57adede 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -188,7 +188,8 @@ else GGDB2=-g2 endif -gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline -fno-default-inline +gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline +gb_DEBUG_CXXFLAGS := -fno-default-inline gb_COMPILERNOOPTFLAGS := -O0 |