mirror of
https://github.com/termux/termux-packages.git
synced 2025-07-28 04:52:36 +00:00
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From a27b848e79fce07b35e927544d964d57ac1e583d Mon Sep 17 00:00:00 2001
|
|
From: Henrik Grimler <grimler@termux.dev>
|
|
Date: Sun, 31 Mar 2024 12:02:51 +0200
|
|
Subject: [PATCH 34/40] make: autoconf: define ARM for arm build with clang
|
|
|
|
Fixes error like
|
|
|
|
ad_arm.cpp:19849:4: error: "ARM must be defined"
|
|
^
|
|
1 warning and 1 error generated.
|
|
gmake[3]: *** [lib/CompileJvm.gmk:143: /home/builder/.termux-build/openjdk-17/src/build/linux-arm-server-release/hotspot/variant-server/libjvm/objs/ad_arm.o] Error 1
|
|
gmake[2]: *** [make/Main.gmk:252: hotspot-server-libs] Error 2
|
|
---
|
|
make/autoconf/flags-cflags.m4 | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
|
|
index 3b35d00795a..1b966e2706e 100644
|
|
--- a/make/autoconf/flags-cflags.m4
|
|
+++ b/make/autoconf/flags-cflags.m4
|
|
@@ -839,6 +839,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
|
|
$1_CFLAGS_CPU="-mcpu=pwr8"
|
|
fi
|
|
|
|
+ if test "x$FLAGS_CPU" = xarm; then
|
|
+ # For whatever reason arm build with clang fails with:
|
|
+ # ad_arm.cpp:19849:4: error: "ARM must be defined"
|
|
+ # Fix by defining arm here as well.
|
|
+ $1_CFLAGS_CPU_JVM="-DARM"
|
|
+ fi
|
|
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
|
|
if test "x$FLAGS_CPU" = xppc64; then
|
|
$1_CFLAGS_CPU_JVM="-qarch=ppc64"
|
|
--
|
|
2.50.1
|
|
|