Rename gcc-base-macx.conf to gcc-base-mac.conf and use it for iOS as well

The only difference between the two is that iOS append @executable_path/
to QMAKE_LFLAGS_SONAME, but since shared libraries are not supported on
iOS anyways, this is not really something we have to care about.

Change-Id: I4797a4dfb94d9b3af03af22618351b98b48f8255
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

14 files changed, 14 insertions, 48 deletions

diff --git a/mkspecs/common/gcc-base-ios.conf b/mkspecs/common/gcc-base-ios.conf
deleted file mode 100644
index 2fd597e973..0000000000
--- a/mkspecs/common/gcc-base-ios.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Base qmake configuration for GCC on iOS
-#
-# Before making changes to this file, please read the comment in
-# gcc-base.conf, to make sure the change goes in the right place.
-#
-# To verify that your change has the desired effect on the final configuration
-# you can use the manual test in tests/manual/mkspecs.
-#
-
-include(gcc-base.conf)
-
-QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4
-
-QMAKE_CFLAGS_DEBUG     += -gdwarf-2
-
-QMAKE_CXXFLAGS_DEBUG   += -gdwarf-2
-
-QMAKE_OBJECTIVE_CFLAGS          = $$QMAKE_CFLAGS
-QMAKE_OBJECTIVE_CFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_OBJECTIVE_CFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-QMAKE_OBJECTIVE_CFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS
-
-QMAKE_LFLAGS                += -headerpad_max_install_names
-QMAKE_LFLAGS_SHLIB          += -single_module -dynamiclib
-QMAKE_LFLAGS_PLUGIN         += $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_INCREMENTAL    += -undefined suppress -flat_namespace
-QMAKE_LFLAGS_SONAME         += -install_name$${LITERAL_WHITESPACE}@executable_path/
-QMAKE_LFLAGS_VERSION        += -current_version$${LITERAL_WHITESPACE}
-QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
-
diff --git a/mkspecs/common/gcc-base-macx.conf b/mkspecs/common/gcc-base-mac.conf
index 45fa248b66..cee129e774 100644
--- a/mkspecs/common/gcc-base-macx.conf
+++ b/mkspecs/common/gcc-base-mac.conf
@@ -1,5 +1,5 @@
 #
-# Base qmake configuration for GCC on Mac OS X
+# Base qmake configuration for GCC on Mac OS X and iOS
 #
 # Before making changes to this file, please read the comment in
 # gcc-base.conf, to make sure the change goes in the right place.
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 43ebc0ab3a..2676cd6f04 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -7,8 +7,7 @@
 #
 # Platform-specific options shared by these compilers are put into:
 #
-# - gcc-base-ios.conf
-# - gcc-base-macx.conf
+# - gcc-base-mac.conf
 # - gcc-base-unix.conf
 #
 # These base files are then combined with configurations for each compiler:
@@ -20,7 +19,7 @@
 # - clang.conf
 #
 # The combination happens in the top level mkspec, by including a platform-
-# specific version of the base-file, for example gcc-base-macx.conf, and then
+# specific version of the base-file, for example gcc-base-mac.conf, and then
 # a (possibly platform-specific) version of the actual compiler configuration,
 # for example g++-macx.conf.
 #
diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf
index e472e5d427..6a0b65d641 100644
--- a/mkspecs/macx-clang-32/qmake.conf
+++ b/mkspecs/macx-clang-32/qmake.conf
@@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/clang.conf)
 include(../common/clang-mac.conf)
 
diff --git a/mkspecs/macx-clang-libc++-32/qmake.conf b/mkspecs/macx-clang-libc++-32/qmake.conf
index a79528dd78..4ba249be22 100644
--- a/mkspecs/macx-clang-libc++-32/qmake.conf
+++ b/mkspecs/macx-clang-libc++-32/qmake.conf
@@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/clang.conf)
 include(../common/clang-mac.conf)
 
diff --git a/mkspecs/macx-clang-libc++/qmake.conf b/mkspecs/macx-clang-libc++/qmake.conf
index 069eacb014..a8858f0b73 100644
--- a/mkspecs/macx-clang-libc++/qmake.conf
+++ b/mkspecs/macx-clang-libc++/qmake.conf
@@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/clang.conf)
 include(../common/clang-mac.conf)
 
diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf
index 10ee15c953..2a6a5a95bc 100644
--- a/mkspecs/macx-clang/qmake.conf
+++ b/mkspecs/macx-clang/qmake.conf
@@ -7,7 +7,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/clang.conf)
 include(../common/clang-mac.conf)
 
diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf
index 34ea7ebca9..aa3df18ec6 100644
--- a/mkspecs/macx-g++-32/qmake.conf
+++ b/mkspecs/macx-g++-32/qmake.conf
@@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf
index 222fcbbed4..c7aa9752d1 100644
--- a/mkspecs/macx-g++/qmake.conf
+++ b/mkspecs/macx-g++/qmake.conf
@@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf
index 5270edf780..23aee379a9 100644
--- a/mkspecs/macx-g++40/qmake.conf
+++ b/mkspecs/macx-g++40/qmake.conf
@@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf
index a20a4f652e..5c1df37027 100644
--- a/mkspecs/macx-g++42/qmake.conf
+++ b/mkspecs/macx-g++42/qmake.conf
@@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf
index 0ad392a4bb..daacd1f00e 100644
--- a/mkspecs/macx-llvm/qmake.conf
+++ b/mkspecs/macx-llvm/qmake.conf
@@ -11,7 +11,7 @@ CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/llvm.conf)
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf
index 41a0783f73..e4ffba0531 100644
--- a/mkspecs/macx-xcode/qmake.conf
+++ b/mkspecs/macx-xcode/qmake.conf
@@ -8,7 +8,7 @@ MAKEFILE_GENERATOR	= XCODE
 CONFIG += lib_version_first incremental plugin_no_soname app_bundle
 
 include(../common/macx.conf)
-include(../common/gcc-base-macx.conf)
+include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf
index 5213d4e555..47aeff8139 100644
--- a/mkspecs/unsupported/macx-ios-clang/qmake.conf
+++ b/mkspecs/unsupported/macx-ios-clang/qmake.conf
@@ -10,7 +10,7 @@ isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = iphoneos
 # keep things simple, e.g. by defining Q_OS_MAC _and_ Q_OS_IOS.
 include(../../common/macx.conf)
 
-include(../../common/gcc-base-ios.conf)
+include(../../common/gcc-base-mac.conf)
 include(../../common/xcode.conf)
 include(../../common/clang.conf)
 include(../../common/clang-mac.conf)