From 7a67c822e3e552d0d881f0409a5316de07dbb8c7 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 11 May 2012 10:03:49 +0200 Subject: configure: Remove the -dwarf2 argument for Mac OS X builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modern versions of Xcode properly support dwarf2, and as such dwarf2 is always enabled. This change removes the ability to turn it off, making dwarf2 non-optional. Change-Id: I149daeae6048ee8a1ed116363572173ad219102e Reviewed-by: Morten Johan Sørvig Reviewed-by: Oswald Buddenhagen --- mkspecs/common/g++-macx.conf | 6 +++--- mkspecs/common/gcc-base-ios.conf | 4 ++-- mkspecs/common/gcc-base-macx.conf | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mkspecs/common') diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf index 1a983ed987..2955c85f5c 100644 --- a/mkspecs/common/g++-macx.conf +++ b/mkspecs/common/g++-macx.conf @@ -10,9 +10,9 @@ include(g++-base.conf) -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2 -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2 -QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g $$QMAKE_CFLAGS_DWARF2 +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2 +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2 +QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2 QMAKE_LFLAGS_STATIC_LIB += -all_load diff --git a/mkspecs/common/gcc-base-ios.conf b/mkspecs/common/gcc-base-ios.conf index 68ec777f85..2fd597e973 100644 --- a/mkspecs/common/gcc-base-ios.conf +++ b/mkspecs/common/gcc-base-ios.conf @@ -12,9 +12,9 @@ include(gcc-base.conf) QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 -QMAKE_CFLAGS_DWARF2 += -gdwarf-2 +QMAKE_CFLAGS_DEBUG += -gdwarf-2 -QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2 +QMAKE_CXXFLAGS_DEBUG += -gdwarf-2 QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON diff --git a/mkspecs/common/gcc-base-macx.conf b/mkspecs/common/gcc-base-macx.conf index e829a550cc..90d1301e48 100644 --- a/mkspecs/common/gcc-base-macx.conf +++ b/mkspecs/common/gcc-base-macx.conf @@ -13,10 +13,10 @@ include(gcc-base.conf) QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 QMAKE_CFLAGS += -mmacosx-version-min=10.6 -QMAKE_CFLAGS_DWARF2 += -gdwarf-2 +QMAKE_CFLAGS_DEBUG += -gdwarf-2 QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 -QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2 +QMAKE_CXXFLAGS_DEBUG += -gdwarf-2 QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -- cgit v1.2.3