From 01a6d0c20182bdc42c3302949840bfb5d99c1dfa Mon Sep 17 00:00:00 2001
From: Torok Edwin <edwin@etorok.net>
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: <2015-07-15>

Gbp-Pq: Name 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
---
 configure             | 2 ++
 tools/Makefile.shared | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index c37a2e52..b58a86dc 100755
--- a/configure
+++ b/configure
@@ -768,6 +768,8 @@ if test $with_sharedlibs = "yes"; then
       shared_libraries_supported=true;;
   esac
 fi
+mksharedlib="$mksharedlib $CCLINKFLAGS"
+mkexe="$mkexe $CCLINKFLAGS"
 
 if test -z "$mkmaindll"; then
   mkmaindll=$mksharedlib
diff --git a/tools/Makefile.shared b/tools/Makefile.shared
index 0b90cd32..2d5546e2 100644
--- a/tools/Makefile.shared
+++ b/tools/Makefile.shared
@@ -287,7 +287,7 @@ endif
 
 objinfo_helper$(EXE): objinfo_helper.c ../config/s.h
 	$(BYTECC) $(CCOUT)objinfo_helper$(EXE) $(BYTECCCOMPOPTS) \
-          objinfo_helper.c $(LIBBFD_LINK)
+          objinfo_helper.c $(LIBBFD_LINK) $(CCLINKFLAGS)
 
 OBJINFO=../compilerlibs/ocamlcommon.cma \
         ../compilerlibs/ocamlbytecomp.cma \
-- 
2.30.2