Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Use native-utils platform names instead of raw strings (#4375)

Browse Source
This commit is contained in:
Tyler Veness
2022-08-25 12:54:11 -07:00
committed by GitHub
parent 3fd69749e7
commit ccf83c634a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shared/config.gradle
View File

@@ -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")
}
}