From 4e1964156e66527e28698de7b5b927a43403e092 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 13 May 2018 23:27:44 -0700 Subject: [PATCH] Removes 32 bit configs for linux and mac. (#1060) For mac, 32 bit will never be supported. Apple has dropped all support. For 32 bit linux, vscode explicitly does not support it, and it is difficult to find anybody using a 32 bit os. --- shared/config.gradle | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/shared/config.gradle b/shared/config.gradle index 28706bd18e..14597ab690 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -139,24 +139,6 @@ if (!project.hasProperty('onlyAthena')) { compilerFamily = 'VisualCpp' detectPlatform = windows64PlatformDetect } - /* Disable 32 bit linux until we can figure out jenkins - linuxX86(BuildConfig) { - architecture = 'x86' - operatingSystem = 'linux' - compilerArgs = linuxCompilerArgs - compilerArgs << linux32BitArg - CCompilerArgs = linuxCCompilerArgs - CCompilerArgs << linux32BitArg - linkerArgs = linuxLinkerArgs - linkerArgs << linux32BitArg - debugCompilerArgs = linuxDebugCompilerArgs - releaseCompilerArgs = linuxReleaseCompilerArgs - releaseStripBinaries = true - compilerFamily = 'Gcc' - detectPlatform = linux32IntelPlatformDetect - exclude << 'halAthena' - } - */ linuxX64(BuildConfig) { architecture = 'x86-64' operatingSystem = 'linux' @@ -169,23 +151,6 @@ if (!project.hasProperty('onlyAthena')) { compilerFamily = 'Gcc' detectPlatform = linux64IntelPlatformDetect } - /* 32 bit Mac OS X not supported by OpenCV. - * If support is ever added, will add this back in - macX86(BuildConfig) { - architecture = 'x86' - operatingSystem = 'osx' - compilerArgs = macCompilerArgs - compilerArgs << mac32BitArg - CCompilerArgs = macCCompilerArgs - CCompilerArgs << mac32BitArg - linkerArgs << mac32BitArg - debugCompilerArgs = macDebugCompilerArgs - releaseCompilerArgs = macReleaseCompilerArgs - releaseStripBinaries = true - compilerFamily = 'Clang' - detectPlatform = mac32PlatformDetect - } - */ macX64(BuildConfig) { architecture = 'x86-64' operatingSystem = 'osx'