diff options
| author | ruki <[email protected]> | 2020-07-05 10:32:38 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-07-05 10:34:37 +0800 |
| commit | c14bfc6fa4e30b2a2af6cb7500bd7b7c16896472 (patch) | |
| tree | d5d682e10937cdebc6fa9285e1e2978a4f17ec21 /xmake | |
| parent | 22229713a006394d0bb5d70865850bad60898f00 (diff) | |
add fortran static library tests
Diffstat (limited to 'xmake')
| -rw-r--r-- | xmake/languages/fortran/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/fortran/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/toolchains/fortran/xmake.lua | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/xmake/languages/fortran/xmake.lua b/xmake/languages/fortran/xmake.lua index 8ae47ce38..3520a3621 100644 --- a/xmake/languages/fortran/xmake.lua +++ b/xmake/languages/fortran/xmake.lua @@ -28,7 +28,7 @@ language("fortran") set_sourceflags {fc = "fcflags"} -- set target kinds - set_targetkinds {binary = "fcld", static = "fcar", shared = "fcsh"} + set_targetkinds {binary = "fcld", static = "ar", shared = "fcsh"} -- set target flags set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"} diff --git a/xmake/rules/fortran/xmake.lua b/xmake/rules/fortran/xmake.lua index c4b630be7..1e694cfd8 100644 --- a/xmake/rules/fortran/xmake.lua +++ b/xmake/rules/fortran/xmake.lua @@ -21,6 +21,10 @@ -- define rule: fortran.build rule("fortran.build") set_sourcekinds("fc") + on_load(function (target) + -- we disable to build across targets in parallel, because the source files may depend on other target modules + target:set("policy", "build.across_targets_in_parallel", false) + end) on_build_files("private.action.build.object", {batch = true}) -- define rule: fortran diff --git a/xmake/toolchains/fortran/xmake.lua b/xmake/toolchains/fortran/xmake.lua index 0b3cb896f..d00d6ce24 100644 --- a/xmake/toolchains/fortran/xmake.lua +++ b/xmake/toolchains/fortran/xmake.lua @@ -29,7 +29,6 @@ toolchain("fortran") set_toolset("fc", "$(env FC)", "gfortran") set_toolset("fcld", "$(env FC)", "gfortran") set_toolset("fcsh", "$(env FC)", "gfortran") - set_toolset("fcar", "$(env FC)", "gfortran") -- on load on_load(function (toolchain) |