diff options
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/detect/tools/find_cpp.lua | 10 | ||||
| -rw-r--r-- | xmake/modules/detect/tools/find_gxx.lua | 7 |
2 files changed, 1 insertions, 16 deletions
diff --git a/xmake/modules/detect/tools/find_cpp.lua b/xmake/modules/detect/tools/find_cpp.lua index e80bfb4e4..9d87c0ebd 100644 --- a/xmake/modules/detect/tools/find_cpp.lua +++ b/xmake/modules/detect/tools/find_cpp.lua @@ -36,19 +36,11 @@ import("lib.detect.find_programver") -- @endcode -- function main(opt) - - -- init options opt = opt or {} - - -- find program - local program = find_program(opt.program or "cpp", opt) - - -- find program version local version = nil + local program = find_program(opt.program or "cpp", opt) if program and opt and opt.version then version = find_programver(program, opt) end - - -- ok? return program, version end diff --git a/xmake/modules/detect/tools/find_gxx.lua b/xmake/modules/detect/tools/find_gxx.lua index 727d1925d..b5537e5b3 100644 --- a/xmake/modules/detect/tools/find_gxx.lua +++ b/xmake/modules/detect/tools/find_gxx.lua @@ -37,13 +37,8 @@ import("lib.detect.find_programver") -- function main(opt) - -- init options opt = opt or {} - - -- find program local program = find_program(opt.program or "g++", opt) - - -- find program version local version = nil if program and opt and opt.version then version = find_programver(program, opt) @@ -57,7 +52,5 @@ function main(opt) is_clang = true end end - - -- ok? return program, version, (is_clang and "clangxx" or "gxx") end |
