Further match off RUST_ARCH, not ARCH_ID

This commit is contained in:
Luke Parker 2024-05-25 20:44:02 -04:00 committed by j-berman
parent 8b279a0666
commit 8c47c0d282

View File

@ -55,7 +55,7 @@ elseif(OPENBSD)
set(RUST_TOOLCHAIN "")
elseif(ANDROID)
set(RUST_PLATFORM "linux-android")
if(ARCH_ID MATCHES "(arm|armv7)")
if(RUST_ARCH MATCHES "(arm|armv7)")
set(RUST_TOOLCHAIN "eabi")
else()
set(RUST_TOOLCHAIN "")
@ -64,16 +64,16 @@ elseif(DRAGONFLY)
set(RUST_PLATFORM "unknown-dragonfly")
set(RUST_TOOLCHAIN "")
elseif(CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)")
if(ARCH_ID MATCHES "x86_64")
if(RUST_ARCH MATCHES "x86_64")
set(RUST_PLATFORM "pc-solaris")
set(RUST_TOOLCHAIN "")
elseif(ARCH_ID MATCHES "sparcv9")
elseif(RUST_ARCH MATCHES "sparcv9")
set(RUST_PLATFORM "sun-solaris")
set(RUST_TOOLCHAIN "")
endif()
else()
set(RUST_PLATFORM "unknown-linux")
if(ARCH_ID MATCHES "armv7")
if(RUST_ARCH MATCHES "armv7")
set(RUST_TOOLCHAIN "-gnueabi")
else()
set(RUST_TOOLCHAIN "-gnu")