From: Torok Edwin <edwin@etorok.net>
Date: Wed, 15 Jul 2015 13:33:23 +0000 (+0300)
Subject: Use CCLINKFLAGS for linking all executables and shared libraries
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6c19c73ee888ca018acd52948ad1f907fc197469;p=ocaml.git

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
---

diff --git a/configure b/configure
index c0024a9c..b8e0bcf7 100755
--- a/configure
+++ b/configure
@@ -815,6 +815,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 b/tools/Makefile
index 9a8cf652..2d19c655 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -316,7 +316,7 @@ endif
 
 objinfo_helper$(EXE): objinfo_helper.c ../config/s.h
 	$(BYTECC) $(CCOUT)objinfo_helper$(EXE) $(BYTECCCOMPOPTS) \
-          $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) objinfo_helper.c $(LIBBFD_LINK)
+          $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) objinfo_helper.c $(LIBBFD_LINK) $(CCLINKFLAGS)
 
 OBJINFO=../compilerlibs/ocamlcommon.cma \
         ../compilerlibs/ocamlbytecomp.cma \