From bca693e0c1a2bfc05eaee9f8ddae06371afa6ef0 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 2 Jan 2015 15:41:23 +0100 Subject: Remove the -load_all option from the linker enabling static builds With the -load_all option turned on then it will cause a problem with the network bearer plugins as they share the same files and on OS X two plugins will be built and potentially linked against when building statically. This only effects gcc builds because clang does not turn this option on when linking by default either. Task-number: QTBUG-39238 Change-Id: Ib259304c3da74b6b4f6fcc6e3766427303af3bbe Reviewed-by: Gabriel de Dietrich --- mkspecs/common/g++-macx.conf | 2 -- 1 file changed, 2 deletions(-) (limited to 'mkspecs/common') diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf index 086510dd96..0ee8130828 100644 --- a/mkspecs/common/g++-macx.conf +++ b/mkspecs/common/g++-macx.conf @@ -14,8 +14,6 @@ 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 - QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42 QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} -- cgit v1.2.3