summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=?UTF-8?q?Ola=20S=C3=B6der?= <rolfkopman@gmail.com>2022-09-25 19:36:38 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-25 19:36:38 +0100
commit4d2073b2610dd6270cc664224dce9524b2a1d758 (patch)
treed8582d5b527d494bb581b91eb56a6f959f32dcea
parent9882e9ddc90abf522809dba4d9fa4de24c74df74 (diff)
patch 9.0.0588: MorphOS build is brokenv9.0.0588
Problem: MorphOS build is broken. Solution: Add "-lm" to LDFLAGS and "-noixemul" to CFLAGS. (Ola Söder, closes #11222)
-rw-r--r--src/Make_ami.mak3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Make_ami.mak b/src/Make_ami.mak
index dd674dc616..77ec32cfcb 100644
--- a/src/Make_ami.mak
+++ b/src/Make_ami.mak
@@ -68,7 +68,8 @@ ifeq ($(UNM),AROS)
LDFLAGS = -DHAVE_FSYNC -ldebug
else
ifeq ($(UNM),MorphOS)
-LDFLAGS = -ldebug -noixemul
+CFLAGS += -noixemul
+LDFLAGS = -ldebug -lm -noixemul
endif
endif
endif
diff --git a/src/version.c b/src/version.c
index 8c9cc5cd79..b0f53ab262 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 588,
+/**/
587,
/**/
586,