Fix warning about headerpad_max_install_names ignored when using bitcode

Actually enables headerpad_max_install_names in the darwin-g++ mkspec as previously it was (presumably accidentally) cleared. Change-Id: I4b2e5a0dcf38658cfe35bc0e5f24769c80f4d877 Reviewed-by: Oswald Buddenhagen <[email protected]>
brad0 · Aug 31, 2016 · 261f6ad · 261f6ad
1 parent f777b1a
commit 261f6ad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/mkspecs/common/gcc-base-mac.conf b/mkspecs/common/gcc-base-mac.conf
@@ -12,12 +12,11 @@ include(gcc-base.conf)
 
 QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 __APPLE_CC__
 
-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}
+QMAKE_LFLAGS_HEADERPAD     += -headerpad_max_install_names
 QMAKE_LFLAGS_VERSION       += -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
 
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
@@ -56,7 +56,6 @@ QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
 
 QMAKE_LINK              = c++
 QMAKE_LINK_SHLIB        = c++
-QMAKE_LFLAGS           += -headerpad_max_install_names
 QMAKE_LFLAGS            =
 QMAKE_LFLAGS_RELEASE    =
 QMAKE_LFLAGS_DEBUG      =
@@ -65,6 +64,7 @@ QMAKE_LFLAGS_SHLIB      = -prebind -dynamiclib -single_module
 QMAKE_LFLAGS_PLUGIN     = -prebind -bundle
 QMAKE_LFLAGS_THREAD     =
 QMAKE_LFLAGS_SONAME    += -install_name$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_HEADERPAD += -headerpad_max_install_names
 
 QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}

diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
@@ -31,6 +31,8 @@ qt {
     equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
 }
 
+!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD
+
 macx-xcode:!isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
     debug_information_format.name = DEBUG_INFORMATION_FORMAT
     debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT

diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
@@ -64,13 +64,14 @@ QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG
 
 QMAKE_LINK              = icpc
 QMAKE_LINK_SHLIB        = icpc
-QMAKE_LFLAGS            = -headerpad_max_install_names
+QMAKE_LFLAGS            =
 QMAKE_LFLAGS_RELEASE    =
 QMAKE_LFLAGS_DEBUG      =
 QMAKE_LFLAGS_SHLIB      = -single_module -dynamiclib
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -install_name$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_HEADERPAD  = -headerpad_max_install_names
 QMAKE_LFLAGS_THREAD     =
 QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 QMAKE_LFLAGS_LTCG       = $$QMAKE_CFLAGS_LTCG