From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 21 Feb 2023 11:25:43 +0000 (+0100)
Subject: mkosi: Drop ld workaround
X-Git-Tag: v254-rc1~1216^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f88f720a8b976184a2adc1e873059aa920fc773b;p=thirdparty%2Fsystemd.git

mkosi: Drop ld workaround

Build scripts will always run in an environment with /etc/ available
now, so we don't need this workaround anymore.
---

diff --git a/mkosi.build b/mkosi.build
index b9ee0f1ae2d..d406e1b003a 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -8,18 +8,6 @@ set -e
 ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
 UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
 
-# On Fedora "ld" is (unfortunately — if you ask me) managed via
-# "alternatives". Since we'd like to support building images in environments
-# with only /usr/ around (e.g. mkosi's UsrOnly=1 option), we have the problem
-# that /usr/bin/ld is a symlink that points to a non-existing file in
-# /etc/alternative/ in this mode. Let's work around this for now by manually
-# redirect "ld" to "ld.bfd", i.e. circumventing the /usr/bin/ld symlink.
-if [ ! -x /usr/bin/ld ] && [ -x /usr/bin/ld.bfd ]; then
-        mkdir -p "$HOME"/bin
-        ln -s /usr/bin/ld.bfd "$HOME"/bin/ld
-        PATH="$HOME/bin:$PATH"
-fi
-
 # If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
 # as out-of-tree build dir. Otherwise, let's make up our own builddir.
 [ -z "$BUILDDIR" ] && BUILDDIR="$PWD"/build