|
 |
d0ea73 |
From 7423e43ec2cd27d52650a1caeb7c0576350e0a78 Mon Sep 17 00:00:00 2001
|
|
|
d0ea73 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
d0ea73 |
Date: Thu, 20 Sep 2018 12:59:44 +0100
|
|
|
d0ea73 |
Subject: [PATCH] tools: Ensure CFLAGS and LDFLAGS are passed to all OCaml
|
|
|
d0ea73 |
binaries (RHBZ#1624130).
|
|
|
d0ea73 |
|
|
|
d0ea73 |
After this commit, all annocheck errors are fixed except for:
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Hardened: virt-get-kernel: MAYB: Gaps were detected in the annobin coverage. Run with -v to list.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
After discussion with the annocheck maintainers this gap in coverage
|
|
|
d0ea73 |
(which corresponds to the OCaml runtime) seems to be caused either by
|
|
|
d0ea73 |
the runtime not being linked with the right flags, or might be a bug
|
|
|
d0ea73 |
in annocheck itself. In any case it's not something that can be
|
|
|
d0ea73 |
resolved within the scope of libguestfs.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
(cherry picked from commit 34c23403c51a4d59d826c8045e06f9aabc2ceb16)
|
|
|
d0ea73 |
---
|
|
|
d0ea73 |
builder/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlaugeas/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlgettext/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlpcre/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlprogress/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlstdutils/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mltools/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlutils/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlvisit/Makefile.am | 2 +-
|
|
|
d0ea73 |
common/mlxml/Makefile.am | 2 +-
|
|
|
d0ea73 |
customize/Makefile.am | 2 +-
|
|
|
d0ea73 |
daemon/Makefile.am | 2 +-
|
|
|
d0ea73 |
dib/Makefile.am | 2 +-
|
|
|
d0ea73 |
generator/Makefile.am | 2 +-
|
|
|
d0ea73 |
get-kernel/Makefile.am | 2 +-
|
|
|
d0ea73 |
ocaml-link.sh.in | 2 +-
|
|
|
d0ea73 |
ocaml/Makefile.am | 2 +-
|
|
|
d0ea73 |
resize/Makefile.am | 2 +-
|
|
|
d0ea73 |
sparsify/Makefile.am | 2 +-
|
|
|
d0ea73 |
sysprep/Makefile.am | 2 +-
|
|
|
d0ea73 |
v2v/Makefile.am | 2 +-
|
|
|
d0ea73 |
v2v/test-harness/Makefile.am | 2 +-
|
|
|
d0ea73 |
22 files changed, 22 insertions(+), 22 deletions(-)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
diff --git a/builder/Makefile.am b/builder/Makefile.am
|
|
|
d0ea73 |
index c7b50778a..a30a229b2 100644
|
|
|
d0ea73 |
--- a/builder/Makefile.am
|
|
|
d0ea73 |
+++ b/builder/Makefile.am
|
|
|
d0ea73 |
@@ -215,7 +215,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlaugeas/Makefile.am b/common/mlaugeas/Makefile.am
|
|
|
d0ea73 |
index 8aa15b80e..2c1a6e0fd 100644
|
|
|
d0ea73 |
--- a/common/mlaugeas/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlaugeas/Makefile.am
|
|
|
d0ea73 |
@@ -61,7 +61,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
|
|
|
d0ea73 |
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
OCAMLPACKAGES =
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlgettext/Makefile.am b/common/mlgettext/Makefile.am
|
|
|
d0ea73 |
index cdcea33ec..b918f90c3 100644
|
|
|
d0ea73 |
--- a/common/mlgettext/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlgettext/Makefile.am
|
|
|
d0ea73 |
@@ -60,7 +60,7 @@ if HAVE_OCAML_PKG_GETTEXT
|
|
|
d0ea73 |
OCAMLPACKAGES += -package gettext-stub
|
|
|
d0ea73 |
endif
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlpcre/Makefile.am b/common/mlpcre/Makefile.am
|
|
|
d0ea73 |
index f9699f592..6f04256da 100644
|
|
|
d0ea73 |
--- a/common/mlpcre/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlpcre/Makefile.am
|
|
|
d0ea73 |
@@ -70,7 +70,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I $(builddir)
|
|
|
d0ea73 |
OCAMLPACKAGES_TESTS = $(MLPCRE_CMA)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlprogress/Makefile.am b/common/mlprogress/Makefile.am
|
|
|
d0ea73 |
index be88ef2de..af006d228 100644
|
|
|
d0ea73 |
--- a/common/mlprogress/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlprogress/Makefile.am
|
|
|
d0ea73 |
@@ -76,7 +76,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I $(top_builddir)/ocaml \
|
|
|
d0ea73 |
-I $(builddir)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am
|
|
|
d0ea73 |
index e38230db8..75252eb46 100644
|
|
|
d0ea73 |
--- a/common/mlstdutils/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlstdutils/Makefile.am
|
|
|
d0ea73 |
@@ -79,7 +79,7 @@ if HAVE_OCAML_PKG_OUNIT
|
|
|
d0ea73 |
OCAMLPACKAGES_TESTS += -package oUnit
|
|
|
d0ea73 |
endif
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am
|
|
|
d0ea73 |
index 66b18f5de..b326cf56a 100644
|
|
|
d0ea73 |
--- a/common/mltools/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mltools/Makefile.am
|
|
|
d0ea73 |
@@ -131,7 +131,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlutils/Makefile.am b/common/mlutils/Makefile.am
|
|
|
d0ea73 |
index 8627e5b10..77feafa56 100644
|
|
|
d0ea73 |
--- a/common/mlutils/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlutils/Makefile.am
|
|
|
d0ea73 |
@@ -74,7 +74,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I $(top_builddir)/common/mlstdutils \
|
|
|
d0ea73 |
-I $(builddir)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlvisit/Makefile.am b/common/mlvisit/Makefile.am
|
|
|
d0ea73 |
index add1fe56e..7230415e7 100644
|
|
|
d0ea73 |
--- a/common/mlvisit/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlvisit/Makefile.am
|
|
|
d0ea73 |
@@ -80,7 +80,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I $(builddir)
|
|
|
d0ea73 |
OCAMLPACKAGES_TESTS = $(MLVISIT_CMA)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/common/mlxml/Makefile.am b/common/mlxml/Makefile.am
|
|
|
d0ea73 |
index eab036b82..7f36b743a 100644
|
|
|
d0ea73 |
--- a/common/mlxml/Makefile.am
|
|
|
d0ea73 |
+++ b/common/mlxml/Makefile.am
|
|
|
d0ea73 |
@@ -72,7 +72,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I $(top_builddir)/gnulib/lib/.libs \
|
|
|
d0ea73 |
-I $(builddir)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/customize/Makefile.am b/customize/Makefile.am
|
|
|
d0ea73 |
index efdd27227..69cf6c13f 100644
|
|
|
d0ea73 |
--- a/customize/Makefile.am
|
|
|
d0ea73 |
+++ b/customize/Makefile.am
|
|
|
d0ea73 |
@@ -173,7 +173,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
virt_customize_DEPENDENCIES = \
|
|
|
d0ea73 |
$(top_srcdir)/ocaml-link.sh \
|
|
|
d0ea73 |
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
|
|
|
d0ea73 |
index d9ed5625e..dcae1a66c 100644
|
|
|
d0ea73 |
--- a/daemon/Makefile.am
|
|
|
d0ea73 |
+++ b/daemon/Makefile.am
|
|
|
d0ea73 |
@@ -347,7 +347,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I $(top_builddir)/common/mlpcre/.libs \
|
|
|
d0ea73 |
-I $(top_builddir)/gnulib/lib/.libs
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/dib/Makefile.am b/dib/Makefile.am
|
|
|
d0ea73 |
index 316f49903..7c2ab09d6 100644
|
|
|
d0ea73 |
--- a/dib/Makefile.am
|
|
|
d0ea73 |
+++ b/dib/Makefile.am
|
|
|
d0ea73 |
@@ -99,7 +99,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/generator/Makefile.am b/generator/Makefile.am
|
|
|
d0ea73 |
index c2d10966a..056d01346 100644
|
|
|
d0ea73 |
--- a/generator/Makefile.am
|
|
|
d0ea73 |
+++ b/generator/Makefile.am
|
|
|
d0ea73 |
@@ -175,7 +175,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I . \
|
|
|
d0ea73 |
-I $(top_srcdir)/common/mlstdutils \
|
|
|
d0ea73 |
-I $(top_builddir)/common/mlstdutils
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
noinst_PROGRAM = generator
|
|
|
d0ea73 |
|
|
|
d0ea73 |
diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am
|
|
|
d0ea73 |
index 81dfb48b4..75379e21f 100644
|
|
|
d0ea73 |
--- a/get-kernel/Makefile.am
|
|
|
d0ea73 |
+++ b/get-kernel/Makefile.am
|
|
|
d0ea73 |
@@ -82,7 +82,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/ocaml-link.sh.in b/ocaml-link.sh.in
|
|
|
d0ea73 |
index fbcc07951..6819c641e 100755
|
|
|
d0ea73 |
--- a/ocaml-link.sh.in
|
|
|
d0ea73 |
+++ b/ocaml-link.sh.in
|
|
|
d0ea73 |
@@ -47,4 +47,4 @@ done
|
|
|
d0ea73 |
exec "$@" \
|
|
|
d0ea73 |
@OCAML_RUNTIME_VARIANT_PIC_OPTION@ \
|
|
|
d0ea73 |
-linkpkg \
|
|
|
d0ea73 |
- -cclib "${cclib}"
|
|
|
d0ea73 |
+ -cclib "@LDFLAGS@ $cclib"
|
|
|
d0ea73 |
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
|
|
|
d0ea73 |
index b0f2900f2..752fc109c 100644
|
|
|
d0ea73 |
--- a/ocaml/Makefile.am
|
|
|
d0ea73 |
+++ b/ocaml/Makefile.am
|
|
|
d0ea73 |
@@ -37,7 +37,7 @@ CLEANFILES += t/*.annot t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if HAVE_OCAML
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
noinst_DATA = mlguestfs.cma META
|
|
|
d0ea73 |
if HAVE_OCAMLOPT
|
|
|
d0ea73 |
diff --git a/resize/Makefile.am b/resize/Makefile.am
|
|
|
d0ea73 |
index 847fb313a..7a4367023 100644
|
|
|
d0ea73 |
--- a/resize/Makefile.am
|
|
|
d0ea73 |
+++ b/resize/Makefile.am
|
|
|
d0ea73 |
@@ -80,7 +80,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
|
|
|
d0ea73 |
index 2ab357a68..2dce5e582 100644
|
|
|
d0ea73 |
--- a/sparsify/Makefile.am
|
|
|
d0ea73 |
+++ b/sparsify/Makefile.am
|
|
|
d0ea73 |
@@ -88,7 +88,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
|
|
|
d0ea73 |
index 0cc9da80a..6ed4ac713 100644
|
|
|
d0ea73 |
--- a/sysprep/Makefile.am
|
|
|
d0ea73 |
+++ b/sysprep/Makefile.am
|
|
|
d0ea73 |
@@ -136,7 +136,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
|
|
|
d0ea73 |
index 7de050b06..7a1ac329e 100644
|
|
|
d0ea73 |
--- a/v2v/Makefile.am
|
|
|
d0ea73 |
+++ b/v2v/Makefile.am
|
|
|
d0ea73 |
@@ -201,7 +201,7 @@ OCAMLCLIBS = \
|
|
|
d0ea73 |
$(LIBINTL) \
|
|
|
d0ea73 |
-lgnu
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
if !HAVE_OCAMLOPT
|
|
|
d0ea73 |
OBJECTS = $(BOBJECTS)
|
|
|
d0ea73 |
diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am
|
|
|
d0ea73 |
index d69188969..22c3b8c49 100644
|
|
|
d0ea73 |
--- a/v2v/test-harness/Makefile.am
|
|
|
d0ea73 |
+++ b/v2v/test-harness/Makefile.am
|
|
|
d0ea73 |
@@ -47,7 +47,7 @@ OCAMLPACKAGES = \
|
|
|
d0ea73 |
-I $(top_builddir)/common/mltools \
|
|
|
d0ea73 |
-I $(top_builddir)/v2v
|
|
|
d0ea73 |
|
|
|
d0ea73 |
-OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
|
|
|
d0ea73 |
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
|
|
|
d0ea73 |
|
|
|
d0ea73 |
BOBJECTS = \
|
|
|
d0ea73 |
$(SOURCES_ML:.ml=.cmo) \
|
|
|
d0ea73 |
--
|
|
|
ca1ab6 |
2.21.0
|
|
|
d0ea73 |
|