diff options
| -rw-r--r-- | mk/dlopen.builtin.mk | 13 | ||||
| -rw-r--r-- | mk/platform/Darwin.mk | 9 |
2 files changed, 13 insertions, 9 deletions
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index 65f384cf7a8..ab1fb57fb79 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.builtin.mk,v 1.25 2013/04/28 13:43:55 obache Exp $ +# $NetBSD: dlopen.builtin.mk,v 1.26 2013/11/01 11:58:48 jperkin Exp $ BUILTIN_PKG:= dl @@ -27,15 +27,12 @@ MAKEVARS+= IS_BUILTIN.dl ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). ### # -# We ignore the value of PREFER_PKGSRC and PREFER_NATIVE because for -# every platform except for Darwin-[56].*, we can only use the built-in -# dynamic linker functions, so USE_BUILTIN.dl must match IS_BUILTIN.dl. +# We ignore the value of PREFER_PKGSRC and PREFER_NATIVE because for every +# platform (unless overridden in the platform file), we can only use the +# built-in dynamic linker functions. # .if !defined(USE_BUILTIN.dl) -USE_BUILTIN.dl= ${IS_BUILTIN.dl} -. if !empty(MACHINE_PLATFORM:MDarwin-[56].*) -USE_BUILTIN.dl= no # Darwin-[56].* uses devel/dlcompat -. endif +USE_BUILTIN.dl= ${IS_BUILTIN.dl} .endif MAKEVARS+= USE_BUILTIN.dl diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index 2a5250e8837..a76dd67fc07 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.55 2013/09/04 15:14:45 jperkin Exp $ +# $NetBSD: Darwin.mk,v 1.56 2013/11/01 11:58:48 jperkin Exp $ # # Variable definitions for the Darwin operating system. @@ -95,6 +95,13 @@ _USE_RPATH= no # don't add rpath to LDFLAGS # Comes with a native mit-krb5 implementation KRB5_DEFAULT?= mit-krb5 +# +# Builtin overrides. +# +.if !empty(OS_VERSION:M[56].*) +USE_BUILTIN.dl= no # Darwin-[56].* uses devel/dlcompat +.endif + # Builtin defaults which make sense for this platform. _OPSYS_PREFER.linux-pam?= native _OPSYS_PREFER.mit-krb5?= native |