Make WITHOUT_UNDEFINED_VERSION the default

Link with --no-undefined-version by default.  Will detect and prevent
the accidental removal of symbols from versioned libraries.

(cherry picked from commit 4510f2ca9170927309a423274e03f1eb8e27da27)
This reverts commit b25ceb97eddcd58cfb2b433fe301ab28c678c249.

Reviewed by:	arichardson, kib, dim, emaste
Differential Revision:	https://reviews.freebsd.org/D44216

2 files changed, 7 insertions, 5 deletions

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index f3e45ca8a661..12f78e20085a 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1719,9 +1719,11 @@ and that the runtime support library is available
 Do not build
 .Xr unbound 8
 and related programs.
-.It Va WITHOUT_UNDEFINED_VERSION
-Link libraries with --no-undefined-version to ensure all symbols are
-provided.
+.It Va WITH_UNDEFINED_VERSION
+Link libraries with --undefined-version which permits version maps to
+contain symbols that are not present in the library.
+If this is necessicary to build a particular configuration, a bug is
+present and the configuration should be reported.
 .It Va WITHOUT_UNIFIED_OBJDIR
 Use the historical object directory format for
 .Xr build 7
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 38d53cc6bf30..65ae4f4cfa7c 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -68,7 +68,6 @@ __DEFAULT_YES_OPTIONS = \
     SSP \
     TESTS \
     TOOLCHAIN \
-    UNDEFINED_VERSION \
     WARNS \
     WERROR
 
@@ -81,7 +80,8 @@ __DEFAULT_NO_OPTIONS = \
     PROFILE \
     RETPOLINE \
     STALE_STAGED \
-    UBSAN
+    UBSAN \
+    UNDEFINED_VERSION
 
 __DEFAULT_DEPENDENT_OPTIONS = \
     MAKE_CHECK_USE_SANDBOX/TESTS \