commit:     7e89bde9528aff4c686b6d70e0f38da3f31e0409
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 12:50:05 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 12:50:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7e89bde9

scripts/bootstrap-prefix: drop obsolete darwin rpath workaround

This has been fixed for some time, and for sure in GCC-14 versions we
use.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 903f199ce9..73e6d10bd8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2039,28 +2039,6 @@ bootstrap_stage2() {
                emerge_pkgs --nodeps "${pkg}" || return 1
        done
 
-       # During Gentoo prefix bootstrap stage2, GCC is built with
-       # "--disable-bootstrap". For Darwin, it means that rather than letting
-       # GCC to eventually build itself using multiple passes, we're forcing
-       # it to build with the host LLVM/clang toolchain in a single pass.
-       # It's not officially supported, but practically it worked. However,
-       # since >=gcc-12.2.0, in order to support the new embedded rpath
-       # feature on Darwin, two incompatible options, "-nodefaultrpaths" and
-       # "-nodefaultexport" are introduced. This causes linking failures,
-       # since these options are only recognized by GCC and are unknown to
-       # LLVM/clang (hypothetically, using an older GCC possibly causes the
-       # same problem as well).
-       #
-       # Thus, embedded rpath should be disabled during prefix bootstrap stage2
-       # and passed into EXTRA_ECONF.
-       # https://bugs.gentoo.org/895334
-       if [[ ${CHOST} == *-darwin* ]] ;
-       then
-               local disable_darwin_rpath="--disable-darwin-at-rpath"
-       else
-               local disable_darwin_rpath=""
-       fi
-
        for pkg in ${compiler_stage1} ; do
                # <glibc-2.5 does not understand .gnu.hash, use
                # --hash-style=both to produce also sysv hash.

Reply via email to