From 1da0db344a6a0332c0284713d3ff645025c617f3 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Fri, 11 May 2012 22:46:54 +0000 Subject: [PATCH] device: don't set a default cross compile prefix qmake -set can be used instead to set a the default cross compile. device_config.prf already contains code to read this default. Remove per-spec CROSS_COMPILE checks Introduce deviceSanityCheckCompiler() usage where appropriate Done-with: Girish Ramakrishnan Change-Id: I07c75c9e933dc1174a1bf8bf523b6b4a6b427408 Reviewed-by: Romain Pokrzywka Reviewed-by: Girish Ramakrishnan --- mkspecs/devices/linux-archos-gen8-g++/qmake.conf | 5 ----- mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf | 2 -- mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf | 1 - mkspecs/devices/linux-beagleboard-g++/qmake.conf | 4 ---- mkspecs/devices/linux-n9-g++/qmake.conf | 2 ++ mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 1 - mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf | 2 -- 7 files changed, 2 insertions(+), 15 deletions(-) diff --git a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf index 5e1fe8a..2523d93 100644 --- a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf +++ b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf @@ -21,10 +21,6 @@ load(device_config) QT_QPA_DEFAULT_PLATFORM = eglfs -isEmpty(CROSS_COMPILE) { - CROSS_COMPILE = arm-angstrom-linux-gnueabi- -} - # modifications to g++.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ @@ -57,7 +53,6 @@ QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $${QMAKE_LIBS_EGL} QMAKE_LIBS_OPENVG = -lOpenVG $${QMAKE_LIBS_EGL} -# Sanity check deviceSanityCheckCompiler() load(qt_config) diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf index fb22fb4..4a28988 100644 --- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf @@ -15,8 +15,6 @@ include(../../common/g++-unix.conf) load(device_config) -isEmpty(CROSS_COMPILE): error("CROSS_COMPILE needs to be set via -device-option CROSS_COMPILE=") - QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ QMAKE_LINK = $${QMAKE_CXX} diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf index ffc0965..f14b94b 100644 --- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -39,7 +39,6 @@ QMAKE_CFLAGS += --sysroot=$${TRIDENT_SHINER_SDK_BUILDTREE}/open_sourc QMAKE_CXXFLAGS += --sysroot=$${TRIDENT_SHINER_SDK_BUILDTREE}/open_source_archive/linux/toolchains/gcc-4.5.2_uclibc/ QMAKE_LFLAGS += --sysroot=$${TRIDENT_SHINER_SDK_BUILDTREE}/open_source_archive/linux/toolchains/gcc-4.5.2_uclibc/ -# Compiler Sanity check deviceSanityCheckCompiler() QMAKE_CFLAGS_RELEASE = -O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard diff --git a/mkspecs/devices/linux-beagleboard-g++/qmake.conf b/mkspecs/devices/linux-beagleboard-g++/qmake.conf index df3f4d3..ccdd412 100644 --- a/mkspecs/devices/linux-beagleboard-g++/qmake.conf +++ b/mkspecs/devices/linux-beagleboard-g++/qmake.conf @@ -17,10 +17,6 @@ load(device_config) QT_QPA_DEFAULT_PLATFORM = eglfs -isEmpty(CROSS_COMPILE) { - CROSS_COMPILE = arm-angstrom-linux-gnueabi- -} - # modifications to g++.conf QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ diff --git a/mkspecs/devices/linux-n9-g++/qmake.conf b/mkspecs/devices/linux-n9-g++/qmake.conf index f26db53..554b643 100644 --- a/mkspecs/devices/linux-n9-g++/qmake.conf +++ b/mkspecs/devices/linux-n9-g++/qmake.conf @@ -31,4 +31,6 @@ QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE QT_QPA_DEFAULT_PLATFORM = xcb +deviceSanityCheckCompiler() + load(qt_config) diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf index 1bcceaf..18b45e4 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf @@ -49,7 +49,6 @@ QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp -# Sanity check deviceSanityCheckCompiler() QT_QPA_DEFAULT_PLATFORM = eglfs diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf index 52c1598..a6fe340 100644 --- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf +++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf @@ -17,8 +17,6 @@ include(../../common/g++-unix.conf) load(device_config) -isEmpty(CROSS_COMPILE): error("CROSS_COMPILE needs to be set via -device-option CROSS_COMPILE=") - QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_CXX = $${CROSS_COMPILE}g++ QMAKE_LINK = $${QMAKE_CXX} -- 2.7.4