blob: 4a19703bef419cd06d3164ee0aeda06135263f63 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
$NetBSD: patch-Makefile,v 1.17 2022/05/24 18:25:38 jaapb Exp $
Use BSD_INSTALL_* instead of mkdir
Honor LDFLAGS
--- Makefile.orig 2022-02-08 16:50:12.000000000 +0000
+++ Makefile
@@ -50,7 +50,7 @@ COMPFLAGS=-strict-sequence -principal -a
-w +a-4-9-40-41-42-44-45-48-66-70 \
-warn-error +a \
-bin-annot -safe-string -strict-formats $(INCLUDES)
-LINKFLAGS=
+LINKFLAGS= -cclib "$(LDFLAGS)"
ifeq "$(strip $(NATDYNLINKOPTS))" ""
OCAML_NATDYNLINKOPTS=
@@ -377,11 +377,11 @@ DOC_FILES=\
# Installation
.PHONY: install
install:
- $(MKDIR) "$(INSTALL_BINDIR)"
- $(MKDIR) "$(INSTALL_LIBDIR)"
- $(MKDIR) "$(INSTALL_STUBLIBDIR)"
- $(MKDIR) "$(INSTALL_COMPLIBDIR)"
- $(MKDIR) "$(INSTALL_DOCDIR)"
+ $(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_STUBLIBDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_COMPLIBDIR)"
+ $(BSD_INSTALL_DATA_DIR) "$(INSTALL_DOCDIR)"
$(MAKE) -C runtime install
$(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)"
ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
@@ -462,7 +462,7 @@ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "tru
$(INSTALL_PROG) \
boot/flexlink.byte$(EXE) "$(INSTALL_BINDIR)/flexlink.byte$(EXE)"
endif # ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
- $(MKDIR) "$(INSTALL_FLEXDLLDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_FLEXDLLDIR)"
$(INSTALL_DATA) $(addprefix stdlib/flexdll/, $(FLEXDLL_OBJECTS)) \
"$(INSTALL_FLEXDLLDIR)"
endif # ifeq "$(BOOTSTRAPPING_FLEXDLL)" "true"
@@ -792,7 +792,7 @@ runtime: $(addprefix stdlib/flexdll/, $(
stdlib/flexdll/flexdll%.$(O): $(FLEXDLL_SOURCES)/flexdll%.$(O) | stdlib/flexdll
cp $< $@
stdlib/flexdll:
- $(MKDIR) $@
+ $(BSD_INSTALL_LIB_DIR) $@
endif
.PHONY: makeruntime
|
