Merge pull request #4024 from sunxfancy/win_flex_bison

Add win_flex and win_bison binary support.
xmake-io · Aug 1, 2023 · 75cb0b3 · 75cb0b3
2 parents ae1dd34 + 0ad563b
commit 75cb0b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/xmake/modules/detect/tools/find_bison.lua b/xmake/modules/detect/tools/find_bison.lua
@@ -36,19 +36,14 @@ import("lib.detect.find_programver")
 -- @endcode
 --
 function main(opt)
-
-    -- init options
     opt = opt or {}
-
-    -- find program
     local program = find_program(opt.program or "bison", opt)
-
-    -- find program version
+    if not program and not opt.program and is_host("windows") then
+        program = find_program("win_bison", opt)
+    end
     local version = nil
     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_flex.lua b/xmake/modules/detect/tools/find_flex.lua
@@ -36,19 +36,14 @@ import("lib.detect.find_programver")
 -- @endcode
 --
 function main(opt)
-
-    -- init options
     opt = opt or {}
-
-    -- find program
     local program = find_program(opt.program or "flex", opt)
-
-    -- find program version
+    if not program and not opt.program and is_host("windows") then
+        program = find_program("win_flex", opt)
+    end
     local version = nil
     if program and opt and opt.version then
         version = find_programver(program, opt)
     end
-
-    -- ok?
     return program, version
 end