summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-03-31 16:36:35 +0300
committerSamuli Piippo <samuli.piippo@digia.com>2014-08-14 12:26:36 +0200
commit347be657b72b7f335de89d2d545073ef7a12263a (patch)
tree14b0eeb93f6a1e6f663e653c605080b2e877d00d
parent319cbb7597100f3b65792dc6a0ce2885ce6c0e8c (diff)
Set iMX device specific compiler flags to QMAKE_CFLAGS
Device specific compiler flags need to go to QMAKE_CFLAGS, so that they are used also when --force-debug-info is used. Removed separate _DEBUG and _RELEASE, since the gcc-base provides same defaults. Change-Id: I6ce0133a1acf419261b7756525185f43581d2a9c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--mkspecs/devices/linux-imx53qsb-g++/qmake.conf7
-rw-r--r--mkspecs/devices/linux-imx6-g++/qmake.conf7
2 files changed, 4 insertions, 10 deletions
diff --git a/mkspecs/devices/linux-imx53qsb-g++/qmake.conf b/mkspecs/devices/linux-imx53qsb-g++/qmake.conf
index 3a9766c4cb..937bbf2416 100644
--- a/mkspecs/devices/linux-imx53qsb-g++/qmake.conf
+++ b/mkspecs/devices/linux-imx53qsb-g++/qmake.conf
@@ -26,11 +26,8 @@ QMAKE_LIBS_OPENVG += -lOpenVG -lEGL
QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib
IMX5_CFLAGS = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 -Wno-psabi
-IMX5_CFLAGS_RELEASE = -O2 $$IMX5_CFLAGS
-QMAKE_CFLAGS_RELEASE += $$IMX5_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE += $$IMX5_CFLAGS_RELEASE
-QMAKE_CFLAGS_DEBUG += $$IMX5_CFLAGS
-QMAKE_CXXFLAGS_DEBUG += $$IMX5_CFLAGS
+QMAKE_CFLAGS += $$IMX5_CFLAGS
+QMAKE_CXXFLAGS += $$IMX5_CFLAGS
include(../common/linux_arm_device_post.conf)
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf
index 2b8dbf6b67..4f464ffa83 100644
--- a/mkspecs/devices/linux-imx6-g++/qmake.conf
+++ b/mkspecs/devices/linux-imx6-g++/qmake.conf
@@ -28,11 +28,8 @@ QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL
QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib
IMX6_CFLAGS = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1
-IMX6_CFLAGS_RELEASE = -O2 $$IMX6_CFLAGS
-QMAKE_CFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE
-QMAKE_CFLAGS_DEBUG += $$IMX6_CFLAGS
-QMAKE_CXXFLAGS_DEBUG += $$IMX6_CFLAGS
+QMAKE_CFLAGS += $$IMX6_CFLAGS
+QMAKE_CXXFLAGS += $$IMX6_CFLAGS
include(../common/linux_arm_device_post.conf)