CVS commit: pkgsrc/security/openssl

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Nov 23 19:44:16 UTC 2019

Modified Files:
        pkgsrc/security/openssl: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 pkgsrc/security/openssl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/Makefile
diff -u pkgsrc/security/openssl/Makefile:1.243 pkgsrc/security/openssl/Makefile:1.244
--- pkgsrc/security/openssl/Makefile:1.243      Mon Nov  4 21:12:56 2019
+++ pkgsrc/security/openssl/Makefile    Sat Nov 23 19:44:16 2019
@@ -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