diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-05-11 10:03:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 12:52:21 +0200 |
| commit | 7a67c822e3e552d0d881f0409a5316de07dbb8c7 (patch) | |
| tree | 408565ec54a369869ea68433e68d62321e8b9c08 /mkspecs | |
| parent | 28dc0a0fa1f645d1d8d86abf2cf3df1913dc96c4 (diff) | |
configure: Remove the -dwarf2 argument for Mac OS X builds
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 <morten.sorvig@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/g++-macx.conf | 6 | ||||
| -rw-r--r-- | mkspecs/common/gcc-base-ios.conf | 4 | ||||
| -rw-r--r-- | mkspecs/common/gcc-base-macx.conf | 4 | ||||
| -rw-r--r-- | mkspecs/features/debug.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/mac/dwarf2.prf | 6 |
5 files changed, 7 insertions, 14 deletions
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 diff --git a/mkspecs/features/debug.prf b/mkspecs/features/debug.prf index c1ba1256cf..b11bfbf6b6 100644 --- a/mkspecs/features/debug.prf +++ b/mkspecs/features/debug.prf @@ -1,5 +1,4 @@ CONFIG -= release -contains(QT_CONFIG,dwarf2)|dwarf2:load(dwarf2, true) QMAKE_CFLAGS += $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_DEBUG QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_DEBUG diff --git a/mkspecs/features/mac/dwarf2.prf b/mkspecs/features/mac/dwarf2.prf deleted file mode 100644 index fc055629f8..0000000000 --- a/mkspecs/features/mac/dwarf2.prf +++ /dev/null @@ -1,6 +0,0 @@ -macx-xcode|macx-pbuilder { -} else { - QMAKE_CFLAGS_DEBUG += $$QMAKE_CFLAGS_DWARF2 - QMAKE_OBJECTIVE_CFLAGS_DEBUG += $$QMAKE_OBJECTIVE_DWARF2 - QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CXXFLAGS_DWARF2 -} |