Skip to content

Commit

Permalink
Merge pull request #33 from xqyjlj/update-dev
Browse files Browse the repository at this point in the history
update
  • Loading branch information
BernardXiong authored Aug 28, 2023
2 parents a06e562 + 713dc36 commit 168ce81
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions repo/packages/a/aarch64-smart-musleabi/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ do
if is_host("windows") then
add_urls("http://117.143.63.254:9012/www/rt-smart/aarch64-linux-musleabi_for_i686-w64-mingw32_$(version).zip")

add_versions("184869", "9dd15ff69ce44270aaccd05ccd038bad15baf60f2e4f0dafadc570a51b2eabde")
add_versions("188177", "01dae6cea76959e7a2684630ca1c295e71ca65a288b4787a6595e93d45edba1e")
elseif is_host("linux") then
add_urls(
"http://117.143.63.254:9012/www/rt-smart/aarch64-linux-musleabi_for_x86_64-pc-linux-gnu_$(version).tar.bz2")

add_versions("184869", "81c62acbdec8076bbbde564891798c84eeec3db1af40383600aec4fdc3a59fca")
add_versions("188177", "e4e2720c0269eb0b00231f865abe2340f1e994490dfbc3d8617eee48098dbc1d")
end

on_install("@windows", "@linux|x86_64", function(package)
Expand Down
6 changes: 5 additions & 1 deletion tools/scripts/rules/rt.cpp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
--
-- Copyright (C) 2022-2023 RT-Thread Development Team
--
-- @author xqyjlj
-- @author xqyjlj
-- @file rt.cpp.lua
--
-- Change Logs:
Expand All @@ -36,6 +36,10 @@ do

target:add("ldflags", flags.ldflags_lib, {force = true})
target:add("ldflags", "-lcxx", {force = true})

if config.arch() == "riscv64gc" then
target:add("ldflags", "-latomic", {force = true})
end
end)
end
rule_end()
4 changes: 2 additions & 2 deletions tools/scripts/tasks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
--
-- Copyright (C) 2023-2023 RT-Thread Development Team
--
-- @author xqyjlj
-- @author xqyjlj
-- @file tasks.lua
--
-- Change Logs:
Expand All @@ -27,7 +27,7 @@ do
on_run("tasks/smart-image/on_run")
set_category("plugin")
set_menu {
usage = "xmake rsmartt-image [options]",
usage = "xmake smart-image [options]",
description = "make image",
options = {
{"f", "format", "kv", "ext4", "image format",
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/toolchains/riscv64gc-unknown-smart-musl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
--
-- Copyright (C) 2022-2023 RT-Thread Development Team
--
-- @author xqyjlj
-- @author xqyjlj
-- @file riscv64gc-unknown-smart-musl.lua
--
-- Change Logs:
Expand Down

0 comments on commit 168ce81

Please sign in to comment.