1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
freebsd-ports/lang/smlnj/files/do-patch-base_runtime_objs_mk.x86-freebsd
Steve Wills 09b003ee49 lang/smlnj: Update to 110.98, unbreak build with Clang >= 10
PR:		248431
Submitted by:	Johannes 5 <joemann@beefree.free.de> (maintainer)
2020-08-02 13:30:50 +00:00

44 lines
2.4 KiB
Plaintext

--- base/runtime/objs/mk.x86-freebsd.orig 2019-11-14 19:19:39 UTC
+++ base/runtime/objs/mk.x86-freebsd
@@ -6,20 +6,20 @@
SHELL = /bin/sh
MAKE = make
-
-AS = as --32
-CC = cc -std=gnu99
-CFLAGS = -O2 -m32
+AS ?= cc -x assembler -c
+ASFLAGS ?= -fPIC
+CC ?= cc -std=gnu99
+CFLAGS ?= -O2 -m32 -fPIC
CPP = cc -x assembler-with-cpp -E -P
-#CPP = /usr/bin/cpp -P
-ARFLAGS = Trcv
-
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
-LD_LIBS = -lm
+LD_LIBS = -ldl -lm
+#CHECK_HEAP = check-heap.o
+XDEFS = -DASSERT_ON
BASE_DEFS =
-DEFS = $(BASE_DEFS) -DARCH_X86 -DDSIZE_32 -DOPSYS_UNIX -DOPSYS_FREEBSD \
- -DGNU_ASSEMBLER -DDLOPEN -DINDIRECT_CFUNC
+DEFS = $(XDEFS) $(BASE_DEFS) -DARCH_X86 -DSIZE_32 \
+ -DOPSYS_UNIX -DOPSYS_FREEBSD -D_GNU_SOURCE -DGNU_ASSEMBLER -DDLOPEN \
+ -DINDIRECT_CFUNC
TARGET = X86
VERSION = v-x86-freebsd
RUNTIME = run.x86-freebsd
@@ -27,6 +27,6 @@ RUNTIME_SO = run.x86-freebsd.so
RUNTIME_A = run.x86-freebsd.a
all:
- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
-# ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
-# ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
+ ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+ -($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))