[Scummvm-git-logs] scummvm master -> 2caff83e37ebcd9a4fcd60245e253331d0c77382

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2caff83e37 CONFIGURE: Allow linking with GOLD to be disabled


Commit: 2caff83e37ebcd9a4fcd60245e253331d0c77382
    https://github.com/scummvm/scummvm/commit/2caff83e37ebcd9a4fcd60245e253331d0c77382
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-04-21T23:34:37+01:00

Commit Message:
CONFIGURE: Allow linking with GOLD to be disabled

Changed paths:
    configure


diff --git a/configure b/configure
index 7ca6231f7f..a612893367 100755
--- a/configure
+++ b/configure
@@ -199,6 +199,7 @@ _bink=yes
 _cloud=auto
 _pandoc=no
 _lld=no
+_gold=yes
 # Default vkeybd/eventrec options
 _vkeybd=no
 _eventrec=no
@@ -282,7 +283,6 @@ add_feature lua "lua" "_lua"
 add_feature fribidi "FriBidi" "_fribidi"
 add_feature cxx11 "c++11" "_use_cxx11"
 add_feature test_cxx11 "Test C++11" "_test_cxx11"
-add_feature lld "Use LLD linker" "_lld"
 
 # Directories for installing ScummVM.
 # This list is closely based on what GNU autoconf does,
@@ -1138,6 +1138,9 @@ for ac_option in $@; do
 	--enable-cloud)               _cloud=yes             ;;
 	--disable-cloud)              _cloud=no              ;;
 	--enable-lld)                 _lld=yes               ;;
+	--disable-lld)                _lld=no                ;;
+	--enable-gold)                _gold=yes              ;;
+	--disable-gold)               _gold=no               ;;
 	--enable-updates)             _updates=yes           ;;
 	--disable-updates)            _updates=no            ;;
 	--enable-libunity)            _libunity=yes          ;;
@@ -2233,7 +2236,7 @@ if test "$_debug_build" != no; then
 			append_var LDFLAGS "-fuse-ld=lld"
 			append_var LDFLAGS "-Wl,--gdb-index"
 			echo_n -- " + LLD"
-		elif cc_check_no_clean $debug_mode -gsplit-dwarf -fuse-ld=gold -Wl,--gdb-index; then
+		elif test "$_gold" = yes && cc_check_no_clean $debug_mode -gsplit-dwarf -fuse-ld=gold -Wl,--gdb-index; then
 			append_var LDFLAGS "-fuse-ld=gold"
 			append_var LDFLAGS "-Wl,--gdb-index"
 			echo_n -- " + Gold"