rename to gfortran toolchains

8 files changed, 10 insertions, 8 deletions

diff --git a/xmake/languages/fortran/xmake.lua b/xmake/languages/fortran/xmake.lua
index 3520a3621..fb17f6f6b 100644
--- a/xmake/languages/fortran/xmake.lua
+++ b/xmake/languages/fortran/xmake.lua
@@ -114,7 +114,6 @@ language("fortran")
 
                 ,   {category = "Cross Complation Configuration/Linker Configuration"            }
                 ,   {nil, "fcld",       "kv", nil,          "The Fortran Linker"                 }
-                ,   {nil, "fcar",       "kv", nil,          "The Fortran Static Library Archiver"}
                 ,   {nil, "fcsh",       "kv", nil,          "The Fortran Shared Library Linker"  }
 
                 ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"     }
diff --git a/xmake/modules/detect/tools/find_gfortran.lua b/xmake/modules/detect/tools/find_gfortran.lua
index 1d5bec7b6..12122abdf 100644
--- a/xmake/modules/detect/tools/find_gfortran.lua
+++ b/xmake/modules/detect/tools/find_gfortran.lua
@@ -31,7 +31,7 @@ import("lib.detect.find_programver")
 -- @code 
 --
 -- local gfortran = find_gfortran()
--- local gfortran, version = find_gfortran({program = "gfortran9", version = true})
+-- local gfortran, version = find_gfortran({program = "g95", version = true})
 -- 
 -- @endcode
 --
@@ -42,6 +42,9 @@ function main(opt)
     
     -- find program
     local program = find_program(opt.program or "gfortran", opt)
+    if not program then
+        program = find_program("g95", opt)
+    end
 
     -- find program version
     local version = nil
diff --git a/xmake/platforms/cygwin/xmake.lua b/xmake/platforms/cygwin/xmake.lua
index deca581bc..76f841a33 100644
--- a/xmake/platforms/cygwin/xmake.lua
+++ b/xmake/platforms/cygwin/xmake.lua
@@ -51,5 +51,5 @@ platform("cygwin")
     end)
 
     -- set toolchains
-    set_toolchains("envs", "cross", "gcc", "clang", "yasm")
+    set_toolchains("envs", "cross", "gcc", "clang", "yasm", "gfortran")
 
diff --git a/xmake/platforms/linux/xmake.lua b/xmake/platforms/linux/xmake.lua
index 3c98f79ce..874bcac7c 100644
--- a/xmake/platforms/linux/xmake.lua
+++ b/xmake/platforms/linux/xmake.lua
@@ -50,7 +50,7 @@ platform("linux")
     end)
 
     -- set toolchains
-    set_toolchains("envs", "cross", "gcc", "clang", "yasm", "nasm", "fasm", "cuda", "dlang", "go", "rust", "fortran")
+    set_toolchains("envs", "cross", "gcc", "clang", "yasm", "nasm", "fasm", "cuda", "dlang", "go", "rust", "gfortran")
 
     -- set menu
     set_menu {
diff --git a/xmake/platforms/macosx/xmake.lua b/xmake/platforms/macosx/xmake.lua
index 6ca50bea7..9df9aaab2 100644
--- a/xmake/platforms/macosx/xmake.lua
+++ b/xmake/platforms/macosx/xmake.lua
@@ -50,7 +50,7 @@ platform("macosx")
     end)
 
     -- set toolchains
-    set_toolchains("envs", "xcode", "clang", "gcc", "yasm", "nasm", "cuda", "dlang", "rust", "go", "fortran")
+    set_toolchains("envs", "xcode", "clang", "gcc", "yasm", "nasm", "cuda", "dlang", "rust", "go", "gfortran")
 
     -- set menu
     set_menu {
diff --git a/xmake/platforms/msys/xmake.lua b/xmake/platforms/msys/xmake.lua
index ec73a87ee..12162d064 100644
--- a/xmake/platforms/msys/xmake.lua
+++ b/xmake/platforms/msys/xmake.lua
@@ -51,5 +51,5 @@ platform("msys")
     end)
 
     -- set toolchains
-    set_toolchains("envs", "cross", "gcc", "clang", "yasm")
+    set_toolchains("envs", "cross", "gcc", "clang", "yasm", "gfortran")
 
diff --git a/xmake/platforms/windows/xmake.lua b/xmake/platforms/windows/xmake.lua
index bc5a03ea1..c53613d71 100644
--- a/xmake/platforms/windows/xmake.lua
+++ b/xmake/platforms/windows/xmake.lua
@@ -48,7 +48,7 @@ platform("windows")
     end)
 
     -- set toolchains
-    set_toolchains("msvc", "clang", "yasm", "nasm", "cuda", "dlang", "rust", "go", "fortran")
+    set_toolchains("msvc", "clang", "yasm", "nasm", "cuda", "dlang", "rust", "go", "gfortran")
 
     -- set menu
     set_menu {
diff --git a/xmake/toolchains/fortran/xmake.lua b/xmake/toolchains/gfortran/xmake.lua
index d00d6ce24..e2bb0e0eb 100644
--- a/xmake/toolchains/fortran/xmake.lua
+++ b/xmake/toolchains/gfortran/xmake.lua
@@ -19,7 +19,7 @@
 --
 
 -- define toolchain
-toolchain("fortran")
+toolchain("gfortran")
 
     -- set homepage
     set_homepage("https://fortran.com/")