From efe3f631f232e6cc3966de59b9237653bf7fa96e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 26 Feb 2015 11:53:04 +0200 Subject: Add mfloat-abi to linker flags for ARM devices Cross compilers from latest yocto (dizzy) are no longer built with default value for mfloat-abi, which means it needs to be given for both compiler and linker to produce correct binaries. Otherwise linker will selected dynamic linker as /lib/ld-linux.so.3, instead of /lib/ld-linux-armhf.so.3 when compiling for hard-float. Change-Id: I2fe116b1a90a0fbd078a4e8757abd4bc64a7b56e Reviewed-by: Laszlo Agocs --- mkspecs/devices/common/linux_arm_device_post.conf | 2 ++ mkspecs/devices/common/linux_device_post.conf | 1 + 2 files changed, 3 insertions(+) diff --git a/mkspecs/devices/common/linux_arm_device_post.conf b/mkspecs/devices/common/linux_arm_device_post.conf index 7ce47592a9..8e5d8e6968 100644 --- a/mkspecs/devices/common/linux_arm_device_post.conf +++ b/mkspecs/devices/common/linux_arm_device_post.conf @@ -1,7 +1,9 @@ contains(DISTRO_OPTS, hard-float) { COMPILER_FLAGS += -mfloat-abi=hard + LINKER_FLAGS += -mfloat-abi=hard } else { COMPILER_FLAGS += -mfloat-abi=softfp + LINKER_FLAGS += -mfloat-abi=softfp } include(linux_device_post.conf) diff --git a/mkspecs/devices/common/linux_device_post.conf b/mkspecs/devices/common/linux_device_post.conf index 548e75affa..d90d25191f 100644 --- a/mkspecs/devices/common/linux_device_post.conf +++ b/mkspecs/devices/common/linux_device_post.conf @@ -5,5 +5,6 @@ contains(DISTRO_OPTS, deb-multi-arch) { QMAKE_CFLAGS += $$COMPILER_FLAGS QMAKE_CXXFLAGS += $$COMPILER_FLAGS +QMAKE_LFLAGS += $$LINKER_FLAGS deviceSanityCheckCompiler() -- cgit v1.2.3