sys-apps/systemd: Do not force ld.gold by default, #539998

diff --git a/sys-apps/systemd/systemd-228-r1.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild
index 1ca11dabc10e564547ec32b3b36290de2a757f1b..a6448c154664a9f0d9556972fcad482d11ba8242 100644 (file)
--- a/sys-apps/systemd/systemd-228-r1.ebuild
+++ b/sys-apps/systemd/systemd-228-r1.ebuild
@@ -168,6 +168,11 @@ multilib_src_configure() {
                # disable -flto since it is an optimization flag
                # and makes distcc less effective
                cc_cv_CFLAGS__flto=no
+               # disable -fuse-ld=gold since Gentoo supports explicit linker
+               # choice and forcing gold is undesired, #539998
+               # ld.gold may collide with user's LDFLAGS, #545168
+               # ld.gold breaks sparc, #573874
+               cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
 
                # Workaround for gcc-4.7, bug 554454.
                cc_cv_CFLAGS__Werror_shadow=no

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f2cc0a91ea31551e097dd687cd1aeddad855260e..1a89016af9019ad0e9cf2046a7786d7d2aab2c56 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -167,6 +167,11 @@ multilib_src_configure() {
                # disable -flto since it is an optimization flag
                # and makes distcc less effective
                cc_cv_CFLAGS__flto=no
+               # disable -fuse-ld=gold since Gentoo supports explicit linker
+               # choice and forcing gold is undesired, #539998
+               # ld.gold may collide with user's LDFLAGS, #545168
+               # ld.gold breaks sparc, #573874
+               cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
 
                # Workaround for gcc-4.7, bug 554454.
                cc_cv_CFLAGS__Werror_shadow=no