From 7a73071fac11db852be636b6855b5013599cc3ea Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 2 Sep 2021 23:18:25 +0800 Subject: improve fpc toolchain --- xmake/platforms/linux/xmake.lua | 2 +- xmake/platforms/macosx/xmake.lua | 2 +- xmake/toolchains/fpc/xmake.lua | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xmake/platforms/linux/xmake.lua b/xmake/platforms/linux/xmake.lua index 7ba068687..f855903f3 100644 --- a/xmake/platforms/linux/xmake.lua +++ b/xmake/platforms/linux/xmake.lua @@ -40,7 +40,7 @@ platform("linux") set_installdir("/usr/local") -- set toolchains - set_toolchains("envs", "cross", "gcc", "clang", "yasm", "nasm", "fasm", "cuda", "dlang", "go", "rust", "gfortran", "zig") + set_toolchains("envs", "cross", "gcc", "clang", "yasm", "nasm", "fasm", "cuda", "dlang", "go", "rust", "gfortran", "zig", "fpc") -- set menu set_menu { diff --git a/xmake/platforms/macosx/xmake.lua b/xmake/platforms/macosx/xmake.lua index 2ff9a10b6..792a5cad3 100644 --- a/xmake/platforms/macosx/xmake.lua +++ b/xmake/platforms/macosx/xmake.lua @@ -40,7 +40,7 @@ platform("macosx") set_installdir("/usr/local") -- set toolchains - set_toolchains("envs", "xcode", "clang", "gcc", "yasm", "nasm", "cuda", "dlang", "rust", "go", "gfortran", "zig") + set_toolchains("envs", "xcode", "clang", "gcc", "yasm", "nasm", "cuda", "dlang", "rust", "go", "gfortran", "zig", "fpc") -- set menu set_menu { diff --git a/xmake/toolchains/fpc/xmake.lua b/xmake/toolchains/fpc/xmake.lua index d3499867a..6ce2bf401 100644 --- a/xmake/toolchains/fpc/xmake.lua +++ b/xmake/toolchains/fpc/xmake.lua @@ -25,9 +25,10 @@ toolchain("fpc") set_homepage("https://www.freepascal.org/") set_description("Free Pascal Programming Language Compiler") - -- on check - on_check(function (toolchain) - end) + -- set toolset + set_toolset("pc", "$(env PC)", "fpc") + set_toolset("pcld", "$(env PC)", "fpc") + set_toolset("pcsh", "$(env PC)", "fpc") -- on load on_load(function (toolchain) -- cgit v1.3.1