diff options
| author | Romain Pokrzywka <romain.pokrzywka@kdab.com> | 2012-05-16 15:59:00 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-17 23:56:16 +0200 |
| commit | c70008d13ec1f6881a0252a3f2d9e45c88e8c889 (patch) | |
| tree | bdf21d17100dadf0cbc417efcab3c697c18c2175 /mkspecs | |
| parent | f12ef7d0b1aa9f990066073b407ce892d187c2a9 (diff) | |
Apply compiler platform flags to debug builds as well
Compiler flags like CPU architecture and FPU should be set on
QMAKE_CFLAGS instead of QMAKE_CFLAGS_RELEASE, as the latter only
applies to release builds
Change-Id: I2e729a9e413934e904fc2810394e118940b8557f
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'mkspecs')
4 files changed, 8 insertions, 8 deletions
diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf index 4a28988e02..7e46c3abf0 100644 --- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf @@ -24,8 +24,8 @@ QMAKE_AR = $${CROSS_COMPILE}ar cqs QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_STRIP = $${CROSS_COMPILE}strip -QMAKE_CFLAGS_RELEASE += -O2 -mfloat-abi=softfp -mfpu=neon -mcpu=cortex-a9 -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CFLAGS += -O2 -mfloat-abi=softfp -mfpu=neon -mcpu=cortex-a9 +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS deviceSanityCheckCompiler() diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf index f14b94b62a..9cc70ab000 100644 --- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -41,8 +41,8 @@ QMAKE_LFLAGS += --sysroot=$${TRIDENT_SHINER_SDK_BUILDTREE}/open_sourc deviceSanityCheckCompiler() -QMAKE_CFLAGS_RELEASE = -O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CFLAGS = -O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS # modifications to linux.conf QMAKE_AR = $${CROSS_COMPILE}ar cqs diff --git a/mkspecs/devices/linux-n9-g++/qmake.conf b/mkspecs/devices/linux-n9-g++/qmake.conf index 554b643fd2..7e4bea9463 100644 --- a/mkspecs/devices/linux-n9-g++/qmake.conf +++ b/mkspecs/devices/linux-n9-g++/qmake.conf @@ -26,8 +26,8 @@ QMAKE_AR = $${CROSS_COMPILE}ar cqs QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_STRIP = $${CROSS_COMPILE}strip -QMAKE_CFLAGS_RELEASE += -O2 -mfloat-abi=hard -mfpu=neon -march=armv7-a -mcpu=cortex-a8 -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CFLAGS += -O2 -mfloat-abi=hard -mfpu=neon -march=armv7-a -mcpu=cortex-a8 +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QT_QPA_DEFAULT_PLATFORM = xcb diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 18b45e4e28..802f0f49a2 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -38,14 +38,14 @@ QMAKE_LIBS_OPENVG = $${QMAKE_LIBS_EGL} QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/opt/vc/include QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL} -QMAKE_CFLAGS_RELEASE += \ +QMAKE_CFLAGS += \ -mfloat-abi=softfp \ -mfpu=vfp \ -mtune=arm1176jzf-s \ -march=armv6zk \ -mabi=aapcs-linux -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp |