From 868dfba741fa50b9c060225730032d70a2d3ae3d Mon Sep 17 00:00:00 2001 From: Torok Edwin Date: Wed, 15 Jul 2015 16:33:23 +0300 Subject: [PATCH] Use CCLINKFLAGS for linking all executables and shared libraries This allows packagers to set additional linker flags for executables and shared libraries created by OCaml, and for the OCaml tools themselves. OCaml code can be linked with various C stubs and C libraries that would benefit from using hardening link flags, such as -Wl,-z,relro. Origin: other Bug-Debian: https://bugs.debian.org/702349 Forwarded: no Last-Update: <2019-07-22> Gbp-Pq: Name 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch --- configure.ac | 3 +++ tools/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f5d8a268..82172d76 100644 --- a/configure.ac +++ b/configure.ac @@ -767,6 +767,9 @@ AS_IF([test x"$enable_shared" != "xno"], natdynlinkopts="-Wl,-E" shared_libraries_supported=true])]) +mksharedlib="$mksharedlib $CCLINKFLAGS" +mkexe="$mkexe $CCLINKFLAGS" + AS_IF([test -z "$mkmaindll"], [mkmaindll=$mksharedlib]) # Configure native dynlink diff --git a/tools/Makefile b/tools/Makefile index ee0e0be4..b6d74d51 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -323,7 +323,7 @@ endif objinfo_helper$(EXE): objinfo_helper.c $(ROOTDIR)/runtime/caml/s.h $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime $(OUTPUTEXE)$@ \ - $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) $< $(LIBBFD_LINK) + $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) $< $(LIBBFD_LINK) $(CCLINKFLAGS) OBJINFO=$(ROOTDIR)/compilerlibs/ocamlcommon.cma \ $(ROOTDIR)/compilerlibs/ocamlbytecomp.cma \ -- 2.30.2