[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/

[Sam James]

commit:     8c4513365769fad2735d1b8403352506fe4a12b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  4 00:53:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  4 00:54:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c451336

media-gfx/blender: don't force gold linker if GCC is detected

We prefer to let the user choose their linker.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/blender/blender-3.0.0.ebuild | 10 ++++++++++
 media-gfx/blender/blender-9999.ebuild  | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/media-gfx/blender/blender-3.0.0.ebuild 
b/media-gfx/blender/blender-3.0.0.ebuild
index 24ae03343e86..ad4ed0c1d319 100644
--- a/media-gfx/blender/blender-3.0.0.ebuild
+++ b/media-gfx/blender/blender-3.0.0.ebuild
@@ -263,8 +263,18 @@ src_configure() {
                -DWITH_USD=OFF
                -DWITH_XR_OPENXR=OFF
        )
+
        append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
 
+       if tc-is-gcc ; then
+               # These options only exist when GCC is detected.
+               # We disable these to respect the user's choice of linker.
+               mycmakeargs+=(
+                       -DWITH_LINKER_GOLD=OFF
+                       -DWITH_LINKER_LLD=OFF
+               )
+       fi
+
        cmake_src_configure
 }
 

diff --git a/media-gfx/blender/blender-9999.ebuild 
b/media-gfx/blender/blender-9999.ebuild
index 48b72fc65808..1ee78855efed 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -263,8 +263,18 @@ src_configure() {
                -DWITH_USD=OFF
                -DWITH_XR_OPENXR=OFF
        )
+
        append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
 
+       if tc-is-gcc ; then
+               # These options only exist when GCC is detected.
+               # We disable these to respect the user's choice of linker.
+               mycmakeargs+=(
+                       -DWITH_LINKER_GOLD=OFF
+                       -DWITH_LINKER_LLD=OFF
+               )
+       fi
+
        cmake_src_configure
 }