diff options
| author | gdt <gdt@pkgsrc.org> | 2019-11-23 19:44:16 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2019-11-23 19:44:16 +0000 |
| commit | 7803f63f2b36c955a5d3ab32ab41ebe20af56410 (patch) | |
| tree | 1af232d899b0a055e30883f6704b52ed751b797b /security | |
| parent | deb8d7a48f6664461ab034f2749456a44c49de5d (diff) | |
| download | pkgsrc-7803f63f2b36c955a5d3ab32ab41ebe20af56410.tar.gz | |
security/openssl: Check for compling with gcc and clang correctly
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 350ab99c302..3ecc963640f 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.243 2019/11/04 21:12:56 rillig Exp $ +# $NetBSD: Makefile,v 1.244 2019/11/23 19:44:16 gdt Exp $ DISTNAME= openssl-1.0.2s PKGREVISION= 1 @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= shared no-fips # Avoid dependency on 'makedepend' on platforms where the default CC is set # to 'cc' not 'gcc' in boostrap-mk-files. OpenSSL only supports the latter. -.if ${PKGSRC_COMPILER} == "gcc" && ${CC} == "cc" +.if !empty(${PKGSRC_COMPILER:Mgcc}) && ${CC} == "cc" CC= gcc .endif @@ -50,7 +50,7 @@ OPENSSL_MACHINE_ARCH= ${MACHINE_ARCH} # back to ./config's autodetection if not. . if defined(OPENSSL_MACHINE_ARCH) && !empty(OPENSSL_MACHINE_ARCH) CONFIGURE_SCRIPT= ./Configure -. if ${PKGSRC_COMPILER} == "clang" || ${PKGSRC_COMPILER} == "gcc" +. if !empty(${PKGSRC_COMPILER:Mclang}) || !empty(${PKGSRC_COMPILER:Mgcc}) CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-gcc . else CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-cc |