Honor LDFLAGS, fixes RELRO build.

This commit is contained in:
wiz 2017-07-13 13:15:25 +00:00
parent 2e4aa65338
commit 8ce83af8a7
4 changed files with 8 additions and 8 deletions

View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.16 2015/11/04 00:35:09 agc Exp $
$NetBSD: distinfo,v 1.17 2017/07/13 13:15:25 wiz Exp $
SHA1 (live.2014.12.11.tar.gz) = 7cd752ad76618611ea366e84aa6ca774646a18f7
RMD160 (live.2014.12.11.tar.gz) = eea3d511123a8c7034e8e4b970d733bed4b96853
SHA512 (live.2014.12.11.tar.gz) = f0a538e78167f0390ca1f14ac90110fd7542db9e52b1ef6c64c9b1bccb2aff4ab5bef718801f58cc64afddd0dc6d065661220d692d4ad115feefc66db724c363
Size (live.2014.12.11.tar.gz) = 628708 bytes
SHA1 (patch-aa) = 67d1928f6d085749aa19b6486b5fe841b76d4364
SHA1 (patch-ba) = f240968640449457506c19d790fe4f5c2c60fe4e
SHA1 (patch-ba) = a60e7960c5e99a46ab2c974f3289a580cbfe9b4f
SHA1 (patch-cc) = 1e968b8742c913f67654d83612bafe4fe01364c0
SHA1 (patch-config.solaris-64bit) = b2ac5b05f9eb7a8ac41adfb9a2326820268531ca
SHA1 (patch-config.solaris-64bit) = a6c5f9b9027ebf3d78b939dc124efc964a9795c8

View file

@ -9,7 +9,7 @@ CPLUSPLUS_FLAGS = ${COMPILE_OPTS} -Wall
OBJ = lo
LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -o
LINK+= # this is needed to add a space!
LINK_OPTS = -Wl,-R${PREFIX}/lib -lm
LINK_OPTS = -Wl,-R${PREFIX}/lib -lm ${LDFLAGS}
CONSOLE_LINK_OPTS = ${LINK_OPTS}
LIBRARY_LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -rpath ${PREFIX}/lib -version-info 0:0 -o
LIBRARY_LINK+= # this is needed to add a space!

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ba,v 1.4 2014/12/13 09:20:02 wiz Exp $
$NetBSD: patch-ba,v 1.5 2017/07/13 13:15:25 wiz Exp $
--- config.solaris-32bit.orig 2014-12-11 10:33:47.000000000 +0000
+++ config.solaris-32bit
@ -26,7 +26,7 @@ $NetBSD: patch-ba,v 1.4 2014/12/13 09:20:02 wiz Exp $
+OBJ = lo
+LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -o
+LINK+= # this is needed to add a space!
+LINK_OPTS = -Wl,-R${PREFIX}/lib -lm
+LINK_OPTS = -Wl,-R${PREFIX}/lib -lm ${LDFLAGS}
+CONSOLE_LINK_OPTS = ${LINK_OPTS}
+LIBRARY_LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -rpath ${PREFIX}/lib -version-info 0:0 -o
+LIBRARY_LINK+= # this is needed to add a space!

View file

@ -1,4 +1,4 @@
$NetBSD: patch-config.solaris-64bit,v 1.2 2014/12/13 09:20:02 wiz Exp $
$NetBSD: patch-config.solaris-64bit,v 1.3 2017/07/13 13:15:25 wiz Exp $
Make 64-bit Solaris work.
@ -22,7 +22,7 @@ Make 64-bit Solaris work.
+OBJ = lo
+LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -o
+LINK+= # this is needed to add a space!
+LINK_OPTS = -Wl,-R${PREFIX}/lib -lm
+LINK_OPTS = -Wl,-R${PREFIX}/lib -lm ${LDFLAGS}
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
-LIBRARY_LINK_OPTS = $(LINK_OPTS) -64 -r -dn