diff options
| author | ruki <[email protected]> | 2022-01-18 16:59:30 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-18 16:59:30 +0800 |
| commit | 1c8adbbb12815c9cad0070621928f58dc5d3161e (patch) | |
| tree | a729aacef725413aea9041f656b5b64038a8d92c | |
| parent | 7bb8966df07702ecc5e582f6e371419363cc0e67 (diff) | |
| parent | 7d6096cd44414f636e09503e5085f03513c6c01f (diff) | |
Merge pull request #1984 from cyfdecyf/dev
toolchain: add gcc-4.8 and gcc-4.9
| -rw-r--r-- | xmake/core/platform/platform.lua | 2 | ||||
| -rw-r--r-- | xmake/toolchains/gcc-4.8/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/toolchains/gcc-4.9/xmake.lua | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/xmake/core/platform/platform.lua b/xmake/core/platform/platform.lua index ea41777c6..cc46b8d41 100644 --- a/xmake/core/platform/platform.lua +++ b/xmake/core/platform/platform.lua @@ -524,7 +524,7 @@ function platform.toolchains() if dirs then for _, dir in ipairs(dirs) do if os.isfile(path.join(dir, "xmake.lua")) then - table.insert(toolchains, path.basename(dir)) + table.insert(toolchains, path.filename(dir)) end end end diff --git a/xmake/toolchains/gcc-4.8/xmake.lua b/xmake/toolchains/gcc-4.8/xmake.lua new file mode 100644 index 000000000..6519646b1 --- /dev/null +++ b/xmake/toolchains/gcc-4.8/xmake.lua @@ -0,0 +1,3 @@ +includes(path.join(os.scriptdir(), "../gcc/xmake.lua")) + +toolchain_gcc("4.8") diff --git a/xmake/toolchains/gcc-4.9/xmake.lua b/xmake/toolchains/gcc-4.9/xmake.lua new file mode 100644 index 000000000..4b489fa5d --- /dev/null +++ b/xmake/toolchains/gcc-4.9/xmake.lua @@ -0,0 +1,3 @@ +includes(path.join(os.scriptdir(), "../gcc/xmake.lua")) + +toolchain_gcc("4.9") |