From aaed0530fd59b9c6c6f10ee4c815d492f0214fa1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 28 Jul 2017 23:14:33 +0200 Subject: [PATCH] configure: don't force debug build for arch & cpu feature tests amends b4525b3407, which gives no indication for why this was done. judging by other tests, it wasn't cargo-culted. i presume it was just about disabling debug-and-release, and the debug choice was arbitrary. the central system nowadays does the same, just that it uses release. amends 1533bfc5fc, which certainly _was_ cargo-culted from the former. as a side effect, this removes some other CONFIG manipulations which are handled centrally or are wholly ineffective nowadays. Change-Id: Ib9af2837925a2f19af05506e798a26d363635735 Reviewed-by: Thiago Macieira --- config.tests/arch/arch.pro | 2 -- config.tests/common/avx/avx.pro | 2 -- config.tests/common/avx2/avx2.pro | 2 -- config.tests/common/avx512/avx512.pro | 2 -- config.tests/common/f16c/f16c.pro | 2 -- config.tests/common/sse2/sse2.pro | 2 -- config.tests/common/sse3/sse3.pro | 2 -- config.tests/common/sse4_1/sse4_1.pro | 2 -- config.tests/common/sse4_2/sse4_2.pro | 2 -- config.tests/common/ssse3/ssse3.pro | 2 -- 10 files changed, 20 deletions(-) diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro index d89d70b1eeb..2ffdb2c8898 100644 --- a/config.tests/arch/arch.pro +++ b/config.tests/arch/arch.pro @@ -1,4 +1,2 @@ TARGET = arch SOURCES = arch.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console diff --git a/config.tests/common/avx/avx.pro b/config.tests/common/avx/avx.pro index bf84089883e..fde4adaea2e 100644 --- a/config.tests/common/avx/avx.pro +++ b/config.tests/common/avx/avx.pro @@ -1,5 +1,3 @@ SOURCES = avx.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_AVX, "var"):error("This compiler does not support AVX") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX diff --git a/config.tests/common/avx2/avx2.pro b/config.tests/common/avx2/avx2.pro index 7ccf66ca28b..1963bdb4b94 100644 --- a/config.tests/common/avx2/avx2.pro +++ b/config.tests/common/avx2/avx2.pro @@ -1,5 +1,3 @@ SOURCES = avx2.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_AVX2, "var"):error("This compiler does not support AVX2") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2 diff --git a/config.tests/common/avx512/avx512.pro b/config.tests/common/avx512/avx512.pro index 96dddb14fd6..1edf5e54320 100644 --- a/config.tests/common/avx512/avx512.pro +++ b/config.tests/common/avx512/avx512.pro @@ -1,6 +1,4 @@ SOURCES = avx512.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(AVX512, "var"): error("You must set the AVX512 variable!") diff --git a/config.tests/common/f16c/f16c.pro b/config.tests/common/f16c/f16c.pro index 6b36c99d964..fcab1877c11 100644 --- a/config.tests/common/f16c/f16c.pro +++ b/config.tests/common/f16c/f16c.pro @@ -1,5 +1,3 @@ SOURCES = f16c.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_F16C, "var"):error("This compiler does not support F16C") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_F16C diff --git a/config.tests/common/sse2/sse2.pro b/config.tests/common/sse2/sse2.pro index 0567eba19d0..75f52667457 100644 --- a/config.tests/common/sse2/sse2.pro +++ b/config.tests/common/sse2/sse2.pro @@ -1,5 +1,3 @@ SOURCES = sse2.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_SSE2, var): error("This compiler does not support SSE2") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 diff --git a/config.tests/common/sse3/sse3.pro b/config.tests/common/sse3/sse3.pro index e2e09bac91d..b26b832e221 100644 --- a/config.tests/common/sse3/sse3.pro +++ b/config.tests/common/sse3/sse3.pro @@ -1,5 +1,3 @@ SOURCES = sse3.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_SSE3, "var"):error("This compiler does not support SSE3") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE3 diff --git a/config.tests/common/sse4_1/sse4_1.pro b/config.tests/common/sse4_1/sse4_1.pro index 273c705efc1..bee9c12adb8 100644 --- a/config.tests/common/sse4_1/sse4_1.pro +++ b/config.tests/common/sse4_1/sse4_1.pro @@ -1,5 +1,3 @@ SOURCES = sse4_1.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_SSE4_1, "var"):error("This compiler does not support SSE4.1") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_1 diff --git a/config.tests/common/sse4_2/sse4_2.pro b/config.tests/common/sse4_2/sse4_2.pro index 3816fdeae97..1626ad748ca 100644 --- a/config.tests/common/sse4_2/sse4_2.pro +++ b/config.tests/common/sse4_2/sse4_2.pro @@ -1,5 +1,3 @@ SOURCES = sse4_2.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_SSE4_2, "var"):error("This compiler does not support SSE4.2") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_2 diff --git a/config.tests/common/ssse3/ssse3.pro b/config.tests/common/ssse3/ssse3.pro index 597b1691402..1d3aebf61df 100644 --- a/config.tests/common/ssse3/ssse3.pro +++ b/config.tests/common/ssse3/ssse3.pro @@ -1,5 +1,3 @@ SOURCES = ssse3.cpp -CONFIG -= qt dylib release debug_and_release -CONFIG += debug console !defined(QMAKE_CFLAGS_SSSE3, "var"):error("This compiler does not support SSSE3") else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSSE3