diff options
| author | tv <tv> | 2005-03-18 18:16:34 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-03-18 18:16:34 +0000 |
| commit | 749d63986abe33e030f5d6d7e47d2a2edd9ab4ff (patch) | |
| tree | 5147a40e92074d16fee67bfab7670e3b69d7b28a /mk/platform/Darwin.mk | |
| parent | 9d4b14894ea6651e68b622108dda0b831c37289e (diff) | |
| download | pkgsrc-749d63986abe33e030f5d6d7e47d2a2edd9ab4ff.tar.gz | |
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.
Diffstat (limited to 'mk/platform/Darwin.mk')
| -rw-r--r-- | mk/platform/Darwin.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index ac54de959d3..194fb7f87b5 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $ +# $NetBSD: Darwin.mk,v 1.8 2005/03/18 18:16:35 tv Exp $ # # Variable definitions for the Darwin operating system. @@ -143,10 +143,8 @@ _USE_RPATH= no # don't add rpath to LDFLAGS _OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive _OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive -.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS) -_STRIPFLAG_CC?= -Wl,-x # cc(1) option to strip -_STRIPFLAG_INSTALL?= -s # install(1) option to strip -.endif +_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip +_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip LOCALBASE?= ${DESTDIR}/usr/pkg |