i386 -> i686, riscv64 -> riscv64gc

Also includes most of what was intended for the prior commit.
This commit is contained in:
Luke Parker 2024-05-25 19:56:20 -04:00 committed by j-berman
parent 75faba1db6
commit 8b279a0666

View File

@ -26,8 +26,14 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
if(ARCH_ID MATCHES "(arm64|armv8a)")
if(ARCH_ID MATCHES "(arm64|armv8a|armv8-a)")
set(RUST_ARCH "aarch64")
elseif(ARCH_ID MATCHES "armv7-a")
set(RUST_ARCH "armv7")
elseif(ARCH_ID MATCHES "i386")
set(RUST_ARCH "i686")
elseif(ARCH_ID MATCHES "riscv64")
set(RUST_ARCH "riscv64gc")
else()
set(RUST_ARCH "${ARCH_ID}")
endif()