7 files changed, 6 insertions, 10 deletions
diff --git a/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile
index 0b794ac..b5be1e2 100644
--- a/libcrypto/libcrypto/buildfile
+++ b/libcrypto/libcrypto/buildfile
@@ -1,5 +1,4 @@
 # file      : libcrypto/buildfile
-# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd
 # license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
 
 import imp_libs = libz%lib{z}
@@ -22,7 +21,6 @@ lib{crypto}: {h   }{** -buildinf-body}              \
                        -poly1305/poly1305_base2_44} \
              { def}{libcrypto}                      \
       crypto/{file}{LPdir_*.c des/ncbc_enc.c}       \
-             {file}{libcrypto.map}                  \
              $imp_libs
 
 # Symlinked where appropriate.
@@ -34,8 +32,12 @@ tsys   = $c.target.system
 
 i686 = ($c.target.cpu == 'i686')
 
+linux   = ($tclass == 'linux')
+bsd     = ($tclass == 'bsd')
 windows = ($tclass == 'windows')
 
+lib{crypto}: file{libcrypto.map}: include = ($linux || $bsd ? adhoc : false)
+
 # Build options.
 #
 # Drop -DOPENSSL_PIC and -D{L|B}_ENDIAN preprocessor options and define
@@ -49,8 +51,8 @@ windows = ($tclass == 'windows')
 #
 c.poptions += -DLIBCRYPTO_BUILD -DZLIB
 
-# Note that the upstream package uses -pthread compiler/linker option on
-# Linux and FreeBSD. The option is currently unsupported by build2, so we use
+# Note that the upstream package uses the -pthread compiler/linker option on
+# Linux and FreeBSD. The option is unsupported by build2 so we pass
 # -D_REENTRANT and -lpthread preprocessor/linker options instead.
 #
 # Also note that on FreeBSD and Mac OS the upstream package also passes
diff --git a/libcrypto/libcrypto/buildinf-body.h.in b/libcrypto/libcrypto/buildinf-body.h.in
index b6c8e96..6b37cf3 100644
--- a/libcrypto/libcrypto/buildinf-body.h.in
+++ b/libcrypto/libcrypto/buildinf-body.h.in
@@ -1,5 +1,4 @@
 /* file      : libcrypto/buildinf-body.h.in -*- C -*-
- * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */
 
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf.h b/libcrypto/libcrypto/downstream/internal/bn_conf.h
index 4c676d6..bdbf8bc 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf.h
+++ b/libcrypto/libcrypto/downstream/internal/bn_conf.h
@@ -1,5 +1,4 @@
 /* file      : libcrypto/downstream/internal/bn_conf.h -*- C -*-
- * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */
 
diff --git a/libcrypto/libcrypto/downstream/internal/buildinf.h b/libcrypto/libcrypto/downstream/internal/buildinf.h
index 626305b..cfb656f 100644
--- a/libcrypto/libcrypto/downstream/internal/buildinf.h
+++ b/libcrypto/libcrypto/downstream/internal/buildinf.h
@@ -1,5 +1,4 @@
 /* file      : libcrypto/downstream/internal/buildinf.h -*- C -*-
- * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */
 
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf.h b/libcrypto/libcrypto/downstream/internal/dso_conf.h
index 1fe74a9..57990e7 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf.h
+++ b/libcrypto/libcrypto/downstream/internal/dso_conf.h
@@ -1,5 +1,4 @@
 /* file      : libcrypto/downstream/internal/dso_conf.h -*- C -*-
- * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */
 
diff --git a/libcrypto/libcrypto/downstream/internal/platform.h b/libcrypto/libcrypto/downstream/internal/platform.h
index 251c223..e3badb6 100644
--- a/libcrypto/libcrypto/downstream/internal/platform.h
+++ b/libcrypto/libcrypto/downstream/internal/platform.h
@@ -1,5 +1,4 @@
 /* file      : libcrypto/downstream/internal/platform.h -*- C -*-
- * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf.h b/libcrypto/libcrypto/downstream/openssl/opensslconf.h
index 810306b..e9eb1cb 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf.h
@@ -1,5 +1,4 @@
 /* file      : libcrypto/downstream/openssl/opensslconf.h -*- C -*-
- * copyright : Copyright (c) 2018-2019 Code Synthesis Ltd
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */