[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b269169a760e2967016791fb185613d33c2a7acf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 20:26:40 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 20:26:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b269169a

scripts/bootstrap-prefix: misc fixes for Big Sur profile setting

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

 scripts/bootstrap-prefix.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c5b3f7ef2c..02ae37585d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -426,6 +426,7 @@ bootstrap_setup() {
                        ;;
                x86_64-apple-darwin2[0123456789])
                        # Big Sur is 11.0
+                       rev=${CHOST##*darwin}
                        profile="prefix/darwin/macos/11.$((rev - 20))/x64"
                        ;;
                i*86-pc-linux-gnu)
@@ -505,9 +506,10 @@ bootstrap_setup() {
        if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
                # setup MacOSX.sdk symlink for GCC, this should probably be
                # managed using an eselect module in the future
-               ( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) 
MacOSX.sdk )
-               einfo "using system sources from $(\
-                       xcrun --show-sdk-version --sdk macosx)"
+               rm -f "${ROOT}"/MacOSX.sdk
+               local SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
+               ( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
+               einfo "using system sources from ${SDKPATH}"
 
                # amend profile, to use gcc one
                profile="${profile}/gcc"