diff --git a/Toolchain/CMake/ClangToolchain.txt.in b/Toolchain/CMake/ClangToolchain.txt.in index 51eb4af1d4..308700697c 100644 --- a/Toolchain/CMake/ClangToolchain.txt.in +++ b/Toolchain/CMake/ClangToolchain.txt.in @@ -21,11 +21,12 @@ set(CMAKE_CXX_COMPILER_TARGET ${triple}) set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PATH}/clang) set(CMAKE_ASM_COMPILER_TARGET ${triple}) set(CMAKE_LINKER ${TOOLCHAIN_PATH}/ld.lld) +set(CMAKE_AR ${TOOLCHAIN_PATH}/llvm-ar) +set(CMAKE_NM ${TOOLCHAIN_PATH}/llvm-nm) +set(CMAKE_OBJCOPY ${TOOLCHAIN_PATH}/llvm-objcopy) set(CMAKE_RANLIB ${TOOLCHAIN_PATH}/llvm-ranlib) set(CMAKE_STRIP ${TOOLCHAIN_PATH}/llvm-strip) -set(CMAKE_AR ${TOOLCHAIN_PATH}/llvm-ar) set(SERENITY_CXXFILT ${TOOLCHAIN_PATH}/llvm-cxxfilt) -set(CMAKE_OBJCOPY ${TOOLCHAIN_PATH}/llvm-objcopy) set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--hash-style=gnu,-z,relro,-z,now,-z,noexecstack,-z,max-page-size=0x1000,-z,separate-code") diff --git a/Toolchain/CMake/GNUToolchain.txt.in b/Toolchain/CMake/GNUToolchain.txt.in index 918bc5fd0c..ae09c1e7df 100644 --- a/Toolchain/CMake/GNUToolchain.txt.in +++ b/Toolchain/CMake/GNUToolchain.txt.in @@ -18,10 +18,11 @@ set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc) set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++) set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}gcc) set(CMAKE_LINKER ${TOOLCHAIN_PREFIX}ld) +set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar) +set(CMAKE_NM ${TOOLCHAIN_PREFIX}gcc-nm) +set(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib) set(CMAKE_STRIP ${TOOLCHAIN_PREFIX}strip) -set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar) -set(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) set(SERENITY_CXXFILT ${TOOLCHAIN_PREFIX}c++filt) set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--hash-style=gnu,-z,relro,-z,now,-z,noexecstack,-z,max-page-size=0x1000,-z,separate-code")