From 1654860f36e315af2a1100c53cbdcf132dab5e09 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 21 Mar 2021 15:50:00 +0100 Subject: [PATCH] makepanda: Rename aarch64 thirdparty dir to arm64 for consistency --- makepanda/makepandacore.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index c6dd9f0e91..b82b840027 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1338,22 +1338,22 @@ def GetThirdpartyDir(): THIRDPARTYDIR = base + "/darwin-libs-a/" elif (target == 'linux'): - if (target_arch.startswith("arm")): + if target_arch in ("aarch64", "arm64"): + THIRDPARTYDIR = base + "/linux-libs-arm64/" + elif target_arch.startswith("arm"): THIRDPARTYDIR = base + "/linux-libs-arm/" elif (target_arch in ("x86_64", "amd64")): THIRDPARTYDIR = base + "/linux-libs-x64/" - elif target_arch == "aarch64": - THIRDPARTYDIR = base + "/linux-libs-aarch64/" else: THIRDPARTYDIR = base + "/linux-libs-a/" elif (target == 'freebsd'): - if (target_arch.startswith("arm")): + if target_arch in ("aarch64", "arm64"): + THIRDPARTYDIR = base + "/freebsd-libs-arm64/" + elif target_arch.startswith("arm"): THIRDPARTYDIR = base + "/freebsd-libs-arm/" elif (target_arch in ("x86_64", "amd64")): THIRDPARTYDIR = base + "/freebsd-libs-x64/" - elif target_arch == "aarch64": - THIRDPARTYDIR = base + "/freebsd-libs-aarch64/" else: THIRDPARTYDIR = base + "/freebsd-libs-a/"