diff --git a/Makefile.config.in b/Makefile.config.in index 500c502b4..01940ee17 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -168,7 +168,7 @@ PTHREAD_CAML_LINK=$(addprefix -cclib ,$(PTHREAD_LINK)) UNIX_OR_WIN32=@unix_or_win32@ UNIXLIB=@unixlib@ BFD_LDLIBS=@bfd_ldlibs@ -LIBBFD_INCLUDE=@libbfd_include@ +BFD_CPPFLAGS=@bfd_cppflags@ INSTALL_SOURCE_ARTIFACTS=@install_source_artifacts@ OC_CFLAGS=@oc_cflags@ diff --git a/configure b/configure index 43c196e28..872f76f16 100755 --- a/configure +++ b/configure @@ -720,7 +720,7 @@ asm_cfi_supported AS ASPP bfd_ldlibs -libbfd_include +bfd_cppflags x_libraries x_includes pthread_link diff --git a/configure.ac b/configure.ac index a7d308291..ae8ee1b84 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,7 @@ AC_SUBST([ocamldoc]) AC_SUBST([pthread_link]) AC_SUBST([x_includes]) AC_SUBST([x_libraries]) -AC_SUBST([libbfd_include]) +AC_SUBST([bfd_cppflags]) AC_SUBST([bfd_ldlibs]) AC_SUBST([ASPP]) AC_SUBST([AS]) diff --git a/tools/Makefile b/tools/Makefile index e32ecce0b..1532b94c5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -273,7 +273,7 @@ objinfo_helper$(EXE): objinfo_helper.$(O) objinfo_helper.$(O): $(ROOTDIR)/runtime/caml/s.h objinfo_helper.$(O): \ - OC_CPPFLAGS += -I$(ROOTDIR)/runtime $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) + OC_CPPFLAGS += -I$(ROOTDIR)/runtime $(DEF_SYMBOL_PREFIX) $(BFD_CPPFLAGS) OBJINFO=$(ROOTDIR)/compilerlibs/ocamlcommon.cma \ $(ROOTDIR)/compilerlibs/ocamlbytecomp.cma \