CVS commit: pkgsrc/mk/compiler

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul 30 18:57:44 UTC 2023

Modified Files:
        pkgsrc/mk/compiler: gcc-style-args.mk

Log Message:
mk: Unbreak pkgsrc on macOS


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/compiler/gcc-style-args.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-style-args.mk
diff -u pkgsrc/mk/compiler/gcc-style-args.mk:1.1 pkgsrc/mk/compiler/gcc-style-args.mk:1.2
--- pkgsrc/mk/compiler/gcc-style-args.mk:1.1    Sat Jul 29 17:55:47 2023
+++ pkgsrc/mk/compiler/gcc-style-args.mk        Sun Jul 30 18:57:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: gcc-style-args.mk,v 1.1 2023/07/29 17:55:47 nia Exp $
+# $NetBSD: gcc-style-args.mk,v 1.2 2023/07/30 18:57:44 nia Exp $
 
 #
 # Some compilers (e.g. clang) share command line argument formats with GCC.
@@ -21,11 +21,13 @@ CWRAPPERS_PREPEND.cc+=      -fcommon
 #
 
 # The user or package can choose the level of RELRO.
-.if ${PKGSRC_USE_RELRO} != "partial" && \
+.if ${_PKGSRC_USE_RELRO} != "no"
+.  if ${_PKGSRC_USE_RELRO} != "partial" && \
     ${RELRO_SUPPORTED:Uyes:tl} != "partial"
 _RELRO_LDFLAGS=                -Wl,-zrelro -Wl,-znow
-.else
+.  else
 _RELRO_LDFLAGS=                -Wl,-zrelro
+.  endif
 .endif
 
 .if !empty(_RELRO_LDFLAGS) && !empty(MACHINE_PLATFORM:MNetBSD-*-*mips*)