CVS commit: pkgsrc/mk/compiler

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu May 24 05:47:21 UTC 2018

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk/compiler/gcc.mk: move _GCC_LDFLAGS setting for relro.

At the previous location it was overridden if a gcc from pkgsrc was used.

Problem found by bacon@


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.191 pkgsrc/mk/compiler/gcc.mk:1.192
--- pkgsrc/mk/compiler/gcc.mk:1.191     Wed May 23 10:17:58 2018
+++ pkgsrc/mk/compiler/gcc.mk   Thu May 24 05:47:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.191 2018/05/23 10:17:58 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.192 2018/05/24 05:47:21 wiz Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -378,11 +378,6 @@ _RELRO_LDFLAGS=            -Wl,-z,relro
 _RELRO_LDFLAGS=                -Wl,-z,relro -Wl,-z,now
 .endif
 
-.if ${_PKGSRC_USE_RELRO} == "yes"
-_GCC_LDFLAGS+=         ${_RELRO_LDFLAGS}
-CWRAPPERS_APPEND.ld+=  ${_RELRO_LDFLAGS}
-.endif
- 
 _STACK_CHECK_CFLAGS=   -fstack-check
 
 .if ${_PKGSRC_USE_STACK_CHECK} == "yes"
@@ -732,6 +727,11 @@ _GCC_LDFLAGS+=     -L${_dir_} ${COMPILER_RPA
 .  endfor
 .endif
 
+.if ${_PKGSRC_USE_RELRO} == "yes"
+_GCC_LDFLAGS+=         ${_RELRO_LDFLAGS}
+CWRAPPERS_APPEND.ld+=  ${_RELRO_LDFLAGS}
+.endif
+ 
 LDFLAGS+=      ${_GCC_LDFLAGS}
 
 # Point the variables that specify the compiler to the installed