GNU libc 2.31 compatibility part two

This fixes underlinking against -lm and reverts the
prior workaround 83cd796a474f746.

1 files changed, 6 insertions, 1 deletions

diff --git a/wscript b/wscript
index ea6e5e4ec9..1c9bb1ff5d 100644
--- a/wscript
+++ b/wscript
@@ -59,7 +59,7 @@ compiler_flags_dictionaries= {
         # Flags to use posix pipes between compiler stages
         'pipe' : '-pipe',
         # Flags for maximally optimized build
-        'full-optimization' : [ '-O3', '-fomit-frame-pointer', '-ffast-math', '-fstrength-reduce', '-fno-finite-math-only' ],
+        'full-optimization' : [ '-O3', '-fomit-frame-pointer', '-ffast-math', '-fstrength-reduce' ],
         # Flag to ensure that compiler error output includes column/line numbers
         'show-column' : '-fshow-column',
         # Flags required to build for x86 only (OS X feature)
@@ -1332,6 +1332,11 @@ int main () { return 0; }
         sub_config_and_use(conf, 'tools/sanity_check')
         sub_config_and_use(conf, 'tools/gccabicheck')
 
+    # explicitly link against libm. This is possible on all POSIX systems
+    # and required on Linux for symbol versioning and ABI compatibility
+    if not (Options.options.dist_target == 'mingw' or Options.options.dist_target == 'msvc'):
+        conf.env.append_value('LIB', 'm')
+
     sub_config_and_use(conf, 'libs/clearlooks-newer')
 
     for i in children: