[pkgsrc/trunk]: pkgsrc/security/openssl security/openssl: Check for compling ...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b898a1d44241
branches:  trunk
changeset: 418251:b898a1d44241
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Nov 23 19:44:16 2019 +0000

description:
security/openssl: Check for compling with gcc and clang correctly

diffstat:

 security/openssl/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d9985c9d335e -r b898a1d44241 security/openssl/Makefile
--- a/security/openssl/Makefile Sat Nov 23 19:41:02 2019 +0000
+++ b/security/openssl/Makefile Sat Nov 23 19:44:16 2019 +0000
@@ -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 @@
 
 # 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 @@
 # 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