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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 8 Aug 2016 13:20:38 -0400
Subject: accept and use CFLAGS and CPPFLAGS from environment
---
Makefile | 9 +++++----
bdb/Makefile | 14 ++++++++------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 42d0256..d9d8aa2 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-CINCLUDES=-I`ocamlc -where`
+CINCLUDES=-I$(shell ocamlc -where)
CC=gcc
CXX=g++
-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
-CXXFLAGS=-O3 $(CINCLUDES) -I .
+CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+CXXFLAGS+=-O3 $(CINCLUDES) -I .
ifndef OCAMLC
OCAMLC=ocamlc
@@ -46,6 +46,7 @@ else
endif
CAMLLDFLAGS=$(foreach x, $(LDFLAGS), -ccopt $(x))
+CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
SKSVS=$(shell grep 'version_suffix = "+"' common.ml)
ifeq ($(strip $(SKSVS)),)
@@ -56,7 +57,7 @@ endif
CAMLP4=-pp $(CAMLP4O)
CAMLINCLUDE= -I lib -I bdb -I +zarith -I +cryptokit
-COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLCFLAGS) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
OCAMLDEP=ocamldep $(CAMLP4)
CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma zarith.cma cryptokit.cma
OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS)
diff --git a/bdb/Makefile b/bdb/Makefile
index e136c38..de70cd5 100644
--- a/bdb/Makefile
+++ b/bdb/Makefile
@@ -14,11 +14,11 @@
# $Id: Makefile,v 1.6 2003/07/05 15:16:29 yminsky Exp $
include ../Makefile.local
-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
+CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE)
CC=gcc
CXX=g++
-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
-CXXFLAGS=-O3 $(CINCLUDES) $(BDBLIB) -I .
+CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I .
MKLIB=ocamlmklib
RANLIB=ranlib
@@ -29,6 +29,8 @@ CAMLLIBS=unix.cma str.cma mylibs.cma
OCAMLFLAGS=$(COMMONCAMLFLAGS) -g
OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40
+CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
+
ifndef LIBDB
LIBDB=-ldb-4.6
endif
@@ -39,7 +41,7 @@ ocextr: ocextr.ml
$(OCAMLC) -o ocextr ocextr.ml
libbdb.a: $(COBJS)
- $(MKLIB) -custom -o bdb $(COBJS)
+ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb $(COBJS)
bdb_stubs.o: bdb_stubs.h bdb_stubs.c
@@ -47,10 +49,10 @@ bdb.ml: ocextr bdb_stubs.c
./ocextr bdb_stubs.c > bdb.ml
bdb.cma: bdb.cmo libbdb.a
- $(MKLIB) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
+ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
bdb.cmxa: bdb.cmx libbdb.a
- $(MKLIB) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
+ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
bdbcaml: bdb.cma
ocamlmktop -o bdbcaml -custom unix.cma bdb.cma $^
|
