diff options
| author | spz <spz> | 2014-08-25 09:17:10 +0000 |
|---|---|---|
| committer | spz <spz> | 2014-08-25 09:17:10 +0000 |
| commit | b3b66b792553aa92ed8869ed4141690e069d46d4 (patch) | |
| tree | 4e781c3589dc7a7c5a1ed0d0d1c0eceedd5f7884 | |
| parent | cac4aea648307672109af44052ab33eabcd42d40 (diff) | |
| download | pkgsrc-b3b66b792553aa92ed8869ed4141690e069d46d4.tar.gz | |
Pullup ticket #4474 - requested by tron
mk/platform/Darwin.mk: build fix
Revisions pulled up:
- mk/platform/Darwin.mk 1.63
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tron
Date: Sun Aug 17 08:32:32 UTC 2014
Modified Files:
pkgsrc/mk/platform: Darwin.mk
Log Message:
Don't use "/bin/ksh" as wrapper shell under Mac OS X Mavericks.
It frequently crashes, at least if you use parallel builds.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mk/platform/Darwin.mk
| -rw-r--r-- | mk/platform/Darwin.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index b682c9979a8..57bdf188354 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.61 2013/12/31 11:13:43 jperkin Exp $ +# $NetBSD: Darwin.mk,v 1.61.4.1 2014/08/25 09:17:10 spz Exp $ # # Variable definitions for the Darwin operating system. @@ -143,6 +143,7 @@ CONFIGURE_ENV+= ac_cv_func_poll=no .endif # Use "/bin/ksh" for buildlink3 wrapper script to improve build performance. -.if empty(OS_VERSION:M[0-8].*) && exists(/bin/ksh) +.if (!empty(OS_VERSION:M9.*) || !empty(OS_VERSION:M1[0-2].*)) && \ + exists(/bin/ksh) WRAPPER_BIN_SH?= /bin/ksh .endif |