Browse Source

Cleanup

Signed-off-by: falkTX <falktx@falktx.com>
pull/117/head
falkTX 1 year ago
parent
commit
8244483a9d
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
6 changed files with 9 additions and 9 deletions
  1. +4
    -4
      scripts/generate-ttl.sh
  2. +1
    -1
      scripts/meson/linux-aarch64.ini
  3. +1
    -1
      scripts/meson/linux-armhf.ini
  4. +1
    -1
      scripts/meson/linux-i686.ini
  5. +1
    -1
      scripts/meson/linux-riscv64.ini
  6. +1
    -1
      scripts/meson/linux-x86_64.ini

+ 4
- 4
scripts/generate-ttl.sh View File

@@ -26,22 +26,22 @@ if [ -z "${MESON_EXE_WRAPPER}" ]; then

elif echo "${fileout}" | grep -q "ARM"; then
if [ "$(uname -m)" != "arm" ] && [ "$(uname -m)" != "armv7l" ]; then
MESON_EXE_WRAPPER="qemu-arm-static -L /usr/lib/arm-linux-gnueabihf"
MESON_EXE_WRAPPER="qemu-arm-static"
fi

elif echo "${fileout}" | grep -q "Intel 80386"; then
if [ "$(uname -m)" != "i386" ] && [ "$(uname -m)" != "i686" ] && [ "$(uname -m)" != "x86_64" ]; then
MESON_EXE_WRAPPER="qemu-i386-static -L /usr/lib/i386-linux-gnu"
MESON_EXE_WRAPPER="qemu-i386-static"
fi

elif echo "${fileout}" | grep -q "RISC-V"; then
if [ "$(uname -m)" != "riscv64" ]; then
MESON_EXE_WRAPPER="qemu-riscv64-static -L /usr/lib/riscv64-linux-gnu"
MESON_EXE_WRAPPER="qemu-riscv64-static"
fi

elif echo "${fileout}" | grep -q "x86-64"; then
if [ "$(uname -m)" != "x86_64" ]; then
MESON_EXE_WRAPPER="qemu-x86_64-static -L /usr/lib/x86_64-linux-gnu"
MESON_EXE_WRAPPER="qemu-x86_64-static"
fi

else


+ 1
- 1
scripts/meson/linux-aarch64.ini View File

@@ -7,7 +7,7 @@ nm = 'aarch64-linux-gnu-gcc-nm'
ld = 'aarch64-linux-gnu-ld'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'pkg-config'
exe_wrapper = 'qemu-aarch64-static -L /usr/lib/aarch64-linux-gnu'
exe_wrapper = 'qemu-aarch64-static'

[host_machine]
system = 'linux'


+ 1
- 1
scripts/meson/linux-armhf.ini View File

@@ -7,7 +7,7 @@ nm = 'arm-linux-gnueabihf-gcc-nm'
ld = 'arm-linux-gnueabihf-ld'
strip = 'arm-linux-gnueabihf-strip'
pkgconfig = 'pkg-config'
exe_wrapper = 'qemu-arm-static -L /usr/lib/arm-linux-gnueabihf'
exe_wrapper = 'qemu-arm-static'

[host_machine]
system = 'linux'


+ 1
- 1
scripts/meson/linux-i686.ini View File

@@ -7,7 +7,7 @@ nm = 'i686-linux-gnu-gcc-nm'
ld = 'i686-linux-gnu-ld'
strip = 'i686-linux-gnu-strip'
pkgconfig = 'pkg-config'
exe_wrapper = 'qemu-i386-static -L /usr/lib/i386-linux-gnu'
exe_wrapper = 'qemu-i386-static'

[host_machine]
system = 'linux'


+ 1
- 1
scripts/meson/linux-riscv64.ini View File

@@ -7,7 +7,7 @@ nm = 'riscv64-linux-gnu-gcc-nm'
ld = 'riscv64-linux-gnu-ld'
strip = 'riscv64-linux-gnu-strip'
pkgconfig = 'pkg-config'
exe_wrapper = 'qemu-riscv64-static -L /usr/lib/riscv64-linux-gnu'
exe_wrapper = 'qemu-riscv64-static'

[host_machine]
system = 'linux'


+ 1
- 1
scripts/meson/linux-x86_64.ini View File

@@ -7,7 +7,7 @@ nm = 'x86_64-linux-gnu-gcc-nm'
ld = 'x86_64-linux-gnu-ld'
strip = 'x86_64-linux-gnu-strip'
pkgconfig = 'pkg-config'
exe_wrapper = 'qemu-x86_64-static -L /usr/lib/x86_64-linux-gnu'
exe_wrapper = 'qemu-x86_64-static'

[host_machine]
system = 'linux'


Loading…
Cancel
Save