From 1f74f0a60a2db8fdcb5d20da162283fb80a11c45 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 31 Oct 2022 22:32:58 +0100 Subject: [PATCH] Consolidate/clean up meson and cmake toolchain files --- images/base-linux64/cross.meson | 3 ++- images/base-linux64/toolchain.cmake | 4 ++-- images/base-linuxarm64/cross.meson | 3 ++- images/base-linuxarm64/toolchain.cmake | 4 ++-- images/base-win32/cross.meson | 3 ++- images/base-win32/toolchain.cmake | 14 +++++++++----- images/base-win64/cross.meson | 3 ++- images/base-win64/toolchain.cmake | 14 +++++++++----- 8 files changed, 30 insertions(+), 18 deletions(-) diff --git a/images/base-linux64/cross.meson b/images/base-linux64/cross.meson index da9e709..8619c70 100644 --- a/images/base-linux64/cross.meson +++ b/images/base-linux64/cross.meson @@ -2,7 +2,8 @@ c = 'x86_64-ffbuild-linux-gnu-gcc' cpp = 'x86_64-ffbuild-linux-gnu-g++' ld = 'x86_64-ffbuild-linux-gnu-ld' -ar = 'x86_64-ffbuild-linux-gnu-ar' +ar = 'x86_64-ffbuild-linux-gnu-gcc-ar' +ranlib = 'x86_64-ffbuild-linux-gnu-gcc-ranlib' strip = 'x86_64-ffbuild-linux-gnu-strip' [host_machine] diff --git a/images/base-linux64/toolchain.cmake b/images/base-linux64/toolchain.cmake index dd73670..91f8226 100644 --- a/images/base-linux64/toolchain.cmake +++ b/images/base-linux64/toolchain.cmake @@ -5,8 +5,8 @@ set(triple x86_64-ffbuild-linux-gnu) set(CMAKE_C_COMPILER ${triple}-gcc) set(CMAKE_CXX_COMPILER ${triple}-g++) -set(CMAKE_RANLIB ${triple}-ranlib) -set(CMAKE_AR ${triple}-ar) +set(CMAKE_RANLIB ${triple}-gcc-ranlib) +set(CMAKE_AR ${triple}-gcc-ar) set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot) set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild) diff --git a/images/base-linuxarm64/cross.meson b/images/base-linuxarm64/cross.meson index b40ba85..88a8609 100644 --- a/images/base-linuxarm64/cross.meson +++ b/images/base-linuxarm64/cross.meson @@ -2,7 +2,8 @@ c = 'aarch64-ffbuild-linux-gnu-gcc' cpp = 'aarch64-ffbuild-linux-gnu-g++' ld = 'aarch64-ffbuild-linux-gnu-ld' -ar = 'aarch64-ffbuild-linux-gnu-ar' +ar = 'aarch64-ffbuild-linux-gnu-gcc-ar' +ranlib = 'x86_64-ffbuild-linux-gnu-gcc-ranlib' strip = 'aarch64-ffbuild-linux-gnu-strip' [host_machine] diff --git a/images/base-linuxarm64/toolchain.cmake b/images/base-linuxarm64/toolchain.cmake index 38fe7c6..9ca16df 100644 --- a/images/base-linuxarm64/toolchain.cmake +++ b/images/base-linuxarm64/toolchain.cmake @@ -5,8 +5,8 @@ set(triple aarch64-ffbuild-linux-gnu) set(CMAKE_C_COMPILER ${triple}-gcc) set(CMAKE_CXX_COMPILER ${triple}-g++) -set(CMAKE_RANLIB ${triple}-ranlib) -set(CMAKE_AR ${triple}-ar) +set(CMAKE_RANLIB ${triple}-gcc-ranlib) +set(CMAKE_AR ${triple}-gcc-ar) set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot) set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild) diff --git a/images/base-win32/cross.meson b/images/base-win32/cross.meson index 5b99ce3..a52a835 100644 --- a/images/base-win32/cross.meson +++ b/images/base-win32/cross.meson @@ -1,7 +1,8 @@ [binaries] c = 'i686-w64-mingw32-gcc' cpp = 'i686-w64-mingw32-g++' -ar = 'i686-w64-mingw32-ar' +ar = 'i686-w64-mingw32-gcc-ar' +ranlib = 'i686-w64-mingw32-gcc-ranlib' strip = 'i686-w64-mingw32-strip' windres = 'i686-w64-mingw32-windres' exe_wrapper = ['wine'] diff --git a/images/base-win32/toolchain.cmake b/images/base-win32/toolchain.cmake index 526610e..4ef5d4c 100644 --- a/images/base-win32/toolchain.cmake +++ b/images/base-win32/toolchain.cmake @@ -1,12 +1,16 @@ set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_PROCESSOR i686) -set(CMAKE_C_COMPILER i686-w64-mingw32-gcc) -set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++) -set(CMAKE_RC_COMPILER i686-w64-mingw32-windres) -set(CMAKE_RANLIB i686-w64-mingw32-ranlib) +set(triple i686-w64-mingw32) -set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /opt/ffbuild) +set(CMAKE_C_COMPILER ${triple}-gcc) +set(CMAKE_CXX_COMPILER ${triple}-g++) +set(CMAKE_RC_COMPILER ${triple}-windres) +set(CMAKE_RANLIB ${triple}-gcc-ranlib) +set(CMAKE_AR ${triple}-gcc-ar) + +set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot) +set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/images/base-win64/cross.meson b/images/base-win64/cross.meson index f5743f0..eb16efb 100644 --- a/images/base-win64/cross.meson +++ b/images/base-win64/cross.meson @@ -1,7 +1,8 @@ [binaries] c = 'x86_64-w64-mingw32-gcc' cpp = 'x86_64-w64-mingw32-g++' -ar = 'x86_64-w64-mingw32-ar' +ar = 'x86_64-w64-mingw32-gcc-ar' +ranlib = 'x86_64-w64-mingw32-gcc-ranlib' strip = 'x86_64-w64-mingw32-strip' windres = 'x86_64-w64-mingw32-windres' exe_wrapper = ['wine'] diff --git a/images/base-win64/toolchain.cmake b/images/base-win64/toolchain.cmake index 72e09eb..7b21acb 100644 --- a/images/base-win64/toolchain.cmake +++ b/images/base-win64/toolchain.cmake @@ -1,12 +1,16 @@ set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) -set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) -set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) -set(CMAKE_RANLIB x86_64-w64-mingw32-ranlib) +set(triple x86_64-w64-mingw32) -set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /opt/ffbuild) +set(CMAKE_C_COMPILER ${triple}-gcc) +set(CMAKE_CXX_COMPILER ${triple}-g++) +set(CMAKE_RC_COMPILER ${triple}-windres) +set(CMAKE_RANLIB ${triple}-gcc-ranlib) +set(CMAKE_AR ${triple}-gcc-ar) + +set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot) +set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)