diff options
| author | schmonz <schmonz@pkgsrc.org> | 2020-09-20 20:01:19 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2020-09-20 20:01:19 +0000 |
| commit | fa14b80a16be1b0331bef8f040c3a7de977ce8f9 (patch) | |
| tree | 700cabbe4422f611bae67f2721cb86d2a96dbacb /devel/nspr | |
| parent | 2ae1013ab2735165a201177fdc8163a6511aa79c (diff) | |
| download | pkgsrc-fa14b80a16be1b0331bef8f040c3a7de977ce8f9.tar.gz | |
Don't pass "--with-macos-sdk=/nonexistent". Fixes this error on Catalina
with Xcode 12:
configure: error: SDK not found. When using --with-macos-sdk, you must
specify a valid SDK. SDKs are installed when the optional cross-development
tools are selected during the Xcode/Developer Tools installation.
While here, merge some of the Darwin conditional logic.
Diffstat (limited to 'devel/nspr')
| -rw-r--r-- | devel/nspr/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 61aee534695..f98b2559448 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2020/09/19 23:53:09 ryoon Exp $ +# $NetBSD: Makefile,v 1.109 2020/09/20 20:01:19 schmonz Exp $ DISTNAME= nspr-${NSPR_RELEASE:S/.0$//} NSPR_RELEASE= 4.29.0 @@ -85,15 +85,12 @@ CONFIGURE_ARGS+= --enable-64bit .endif .if ${OPSYS} == "Darwin" -# Avoid using invalid deployment targets. -CONFIGURE_ARGS+= --with-macos-sdk=/nonexistent . if defined(ABI) && ${ABI} == "64" CONFIGURE_ARGS+= --enable-64bit . endif -.endif - -.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon) +. if exists(/Developer/Headers/FlatCarbon) BUILDLINK_PASSTHRU_DIRS+= Developer/Headers/FlatCarbon +. endif .endif pre-configure: |