diff options
| author | Brad Smith <brad@comstyle.com> | 2025-11-17 00:50:47 -0500 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2025-11-18 13:07:14 +0100 |
| commit | 2a7c40c1f0ab8ffc9fef59277ed816e66ce10395 (patch) | |
| tree | 1c946bc81b6e046b7757495f8f3e1036926aefb8 | |
| parent | 008443272a3ca08368b973bd44449b2720d0819d (diff) | |
| download | Project-Tick-2a7c40c1f0ab8ffc9fef59277ed816e66ce10395.tar.gz Project-Tick-2a7c40c1f0ab8ffc9fef59277ed816e66ce10395.zip | |
configure: Determine system architecture properly on *BSD systems
uname -m on a BSD system will provide the architecture port .e.g.
arm64, macppc, octeon instead of the machine architecture .e.g.
aarch64, powerpc, mips64. uname -p will provide the machine
architecture. NetBSD uses x86_64, OpenBSD uses amd64, FreeBSD
is a mix between uname -p and the compiler output.
| -rwxr-xr-x | configure | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -29,11 +29,17 @@ if [ -n "${CHOST}" ]; then CROSS_PREFIX="${CHOST}-" ARCH="$(echo "${NORM_CHOST}" | sed -e 's/-.*//')" else - ARCH="$(uname -m)" + # BSD systems use uname -p for architecture names vs port names + case "$(uname -s)" in + *BSD | *bsd* | DragonFly) + ARCH="$(uname -p)" ;; + *) + ARCH="$(uname -m)" ;; + esac fi case "${ARCH}" in - x86_64) + amd64 | x86_64) case "${CFLAGS}" in *-m32*) ARCH=i686 @@ -337,7 +343,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then else ARCH=$CC_ARCH fi ;; - x86_64) + amd64 | x86_64) # Honor user choice if gcc is multilib and 32-bit is requested if test $build32 -ne 1; then ARCH=$CC_ARCH @@ -1794,7 +1800,7 @@ ARCH_SHARED_OBJS='' # Set ARCH specific FLAGS case "${ARCH}" in # x86/amd64 specific optimizations - i386 | i486 | i586 | i686 |x86_64) + i386 | i486 | i586 | i686 | amd64 | x86_64) ARCHDIR=arch/x86 # Enable arch-specific optimizations |