From 4a6d5dca94ccf5b8fd44dfa2e3735484379786c7 Mon Sep 17 00:00:00 2001
From: tv <tv>
Date: Fri, 18 Mar 2005 18:16:34 +0000
Subject: Fix a gleaming illustration of why using YES/NO variables everywhere
 possible, just for the sake of doing so, is not a good thing to do:

The platform files define _STRIPFLAG_* to determine whether to strip things.
But since this is included in bsd.prefs.mk, ".if ..." checks cannot take
things set in the Makefile into account.  So convert INSTALL_UNSTRIPPED=YES
to a defined/undefined variable check in bsd.pkg.mk, and use the :D:U idiom
in the _STRIPFLAG_* variables.

This should fix PR pkg/28772 and PR pkg/29031.
---
 mk/platform/SunOS.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'mk/platform/SunOS.mk')

diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 5cbcadce1c1..d3abde5b5aa 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.9 2005/01/28 21:05:59 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.10 2005/03/18 18:16:35 tv Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -144,10 +144,8 @@ _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-z defaultextract
 # incompatible.
 _INCOMPAT_ICONV=	SunOS-*-*
 
-.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
-_STRIPFLAG_CC?=		-s	# cc(1) option to strip
-_STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
-.endif
+_STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
+_STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
 
 # Migration aid for old /usr/local LOCALBASE
 .if !defined(LOCALBASE) && exists(${DESTDIR}/usr/local/libexec/cgi-bin) && \
-- 
cgit v1.2.3