From ccf83c634a76ca990cf7b1a6b40d7ba731b80363 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Thu, 25 Aug 2022 12:54:11 -0700 Subject: [PATCH] [build] Use native-utils platform names instead of raw strings (#4375) --- shared/config.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/config.gradle b/shared/config.gradle index 097dc0ad88..611c6ffb63 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -38,7 +38,7 @@ nativeUtils.platformConfigs.each { return } it.linker.args << '-Wl,-rpath,\'$ORIGIN\'' - if (it.name == 'osxx86-64' || it.name == 'osxarm64') { + if (it.name.contains('osx')) { it.linker.args << "-headerpad_max_install_names" } } @@ -46,9 +46,9 @@ nativeUtils.platformConfigs.each { // Suppress OpenCV warning // https://github.com/opencv/opencv/issues/20269 nativeUtils.platformConfigs.each { - if (it.name == 'linuxx86-64') { + if (it.name == nativeUtils.wpi.platforms.linuxx64) { it.cppCompiler.args.add("-Wno-deprecated-enum-enum-conversion") - } else if (it.name == 'osxx86-64' || it.name == 'osxarm64') { + } else if (it.name.contains('osx')) { it.cppCompiler.args.add("-Wno-deprecated-anon-enum-enum-conversion") } }