CVS commit: pkgsrc/mk

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 13 20:21:23 UTC 2024

Modified Files:
        pkgsrc/mk: bsd.prefs.mk

Log Message:
bsd.prefs.mk: Unconditionally define TOOLS_CROSS_DESTDIR.

- If we're cross-compiling or building cross-libtool-base, alias for
  CROSS_DESTDIR.

- Otherwise, empty.

This will be convenient for sprinkling TOOLS_CROSS_DESTDIR in various
places throughout mk/ without worrying about disrupting native
builds.

No change to native builds here because all current references are
conditional on USE_CROSS_COMPILE = yes.


To generate a diff of this commit:
cvs rdiff -u -r1.436 -r1.437 pkgsrc/mk/bsd.prefs.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/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.436 pkgsrc/mk/bsd.prefs.mk:1.437
--- pkgsrc/mk/bsd.prefs.mk:1.436        Sun Jul 30 19:04:02 2023
+++ pkgsrc/mk/bsd.prefs.mk      Sat Jan 13 20:21:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.436 2023/07/30 19:04:02 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.437 2024/01/13 20:21:23 riastradh Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -554,7 +554,11 @@ _MAKE_PACKAGE_AS_ROOT?=    yes
 # TOOLS_CROSS_DESTDIR is used for the libtool build to make a wrapper
 # that points at the cross-destdir as sysroot, without setting
 # _CROSS_DESTDIR because we're actually building a native package.
+.if ${TOOLS_USE_CROSS_COMPILE:tl} == "yes"
 TOOLS_CROSS_DESTDIR=           ${CROSS_DESTDIR}
+.else
+TOOLS_CROSS_DESTDIR=           # empty
+.endif
 
 # Depends on MACHINE_ARCH override above
 .if ${OPSYS} == "NetBSD"