From 63b50abeded5099910f3a70df820266628d3fac6 Mon Sep 17 00:00:00 2001 From: jackun Date: Fri, 11 Sep 2020 10:47:26 +0300 Subject: [PATCH] Try out tls/x86_64, tls/i686 for less symlinking --- bin/mangohud-setup.sh | 15 +++++---------- build.sh | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/bin/mangohud-setup.sh b/bin/mangohud-setup.sh index e5f10e5f..da5ec320 100755 --- a/bin/mangohud-setup.sh +++ b/bin/mangohud-setup.sh @@ -55,16 +55,11 @@ mangohud_install() { install -vm755 ./usr/bin/mangohud /usr/bin/mangohud # FIXME get the triplet somehow - ln -sv lib /usr/lib/mangohud/lib64 - ln -sv lib /usr/lib/mangohud/x86_64 - ln -sv lib /usr/lib/mangohud/x86_64-linux-gnu - ln -sv . /usr/lib/mangohud/lib/x86_64 - ln -sv . /usr/lib/mangohud/lib/x86_64-linux-gnu - ln -sv lib32 /usr/lib/mangohud/i686 - ln -sv lib32 /usr/lib/mangohud/i386-linux-gnu - ln -sv ../lib32 /usr/lib/mangohud/lib/i386-linux-gnu - ln -sv lib32 /usr/lib/mangohud/i686-linux-gnu - ln -sv ../lib32 /usr/lib/mangohud/lib/i686-linux-gnu + mkdir -p /usr/lib/mangohud/tls + ln -sv ../lib /usr/lib/mangohud/tls/x86_64 + ln -sv ../lib32 /usr/lib/mangohud/tls/i686 + # $LIB can be "lib/tls/x86_64"? + ln -sv ../tls /usr/lib/mangohud/lib/tls #ln -sv lib /usr/lib/mangohud/aarch64-linux-gnu #ln -sv lib /usr/lib/mangohud/arm-linux-gnueabihf diff --git a/build.sh b/build.sh index a828809f..05b08462 100755 --- a/build.sh +++ b/build.sh @@ -214,16 +214,11 @@ install() { /usr/bin/install -vm755 ./build/release/usr/bin/mangohud /usr/bin/mangohud # FIXME get the triplet somehow - ln -sv lib /usr/lib/mangohud/lib64 - ln -sv lib /usr/lib/mangohud/x86_64 - ln -sv lib /usr/lib/mangohud/x86_64-linux-gnu - ln -sv . /usr/lib/mangohud/lib/x86_64 - ln -sv . /usr/lib/mangohud/lib/x86_64-linux-gnu - ln -sv lib32 /usr/lib/mangohud/i686 - ln -sv lib32 /usr/lib/mangohud/i386-linux-gnu - ln -sv ../lib32 /usr/lib/mangohud/lib/i386-linux-gnu - ln -sv lib32 /usr/lib/mangohud/i686-linux-gnu - ln -sv ../lib32 /usr/lib/mangohud/lib/i686-linux-gnu + mkdir -p /usr/lib/mangohud/tls + ln -sv ../lib /usr/lib/mangohud/tls/x86_64 + ln -sv ../lib32 /usr/lib/mangohud/tls/i686 + # $LIB can be "lib/tls/x86_64"? + ln -sv ../tls /usr/lib/mangohud/lib/tls #ln -sv lib /usr/lib/mangohud/aarch64-linux-gnu #ln -sv lib /usr/lib/mangohud/arm-linux-gnueabihf