Skip to content

Commit 22d801d

Browse files
committed
尝试修复CI问题
1 parent badcd88 commit 22d801d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

components/lwp/vdso/SConscript

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ src +=Glob('kernel/*.S')
2323

2424

2525
if not hasattr(rtconfig, 'CPP') or rtconfig.CPP is None:
26-
CPP = rtconfig.PREFIX + 'cpp'
26+
rtconfig.CPP = rtconfig.PREFIX + 'cpp'
2727
if not hasattr(rtconfig, 'CPPFLAGS') or rtconfig.CPPFLAGS is None:
28-
CPPFLAGS = ' -E -P -x assembler-with-cpp'
28+
rtconfig.CPPFLAGS = ' -E -P -x assembler-with-cpp'
2929

3030
if not os.path.exists(cwd + "/user" + "/arch" +"/" + rtconfig.ARCH + "/vdso.lds"):
3131
Preprocessing("user/arch/" + rtconfig.ARCH + "/vdso.lds.S", ".lds", CPPPATH=[cwd])
@@ -36,7 +36,8 @@ if not os.path.exists(cwd + "/user" + "/arch" +"/" + rtconfig.ARCH + "/vdso.lds"
3636
# clean = ["xmake", "clean"]
3737

3838
vdso_file = os.path.join(cwd, 'user',"arch", rtconfig.ARCH, 'SConstruct')
39-
command = ["scons", "-f", vdso_file]
39+
EXEC_PATH_PASS = "EXEC_PATH=" + rtconfig.EXEC_PATH
40+
command = ["scons", "-f", vdso_file, EXEC_PATH_PASS]
4041
clean = ["scons", "-f", vdso_file, "--clean"]
4142

4243
if not GetOption('clean'):

components/lwp/vdso/user/arch/risc-v/SConstruct

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ rt_root_path = os.path.abspath(os.path.join(vdso_usr, "../../../../../../"))
1111
include_path = os.path.join(rt_root_path, "include")
1212
rtconfig_path = os.path.join(rt_root_path, "bsp", "qemu-virt64-riscv")
1313

14-
EXEC_PATH = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
14+
EXEC_PATH = ARGUMENTS.get('EXEC_PATH')
15+
if not EXEC_PATH:
16+
EXEC_PATH = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
1517
PREFIX = os.getenv('RTT_CC_PREFIX') or 'riscv64-unknown-linux-gnu-'
1618

1719
CC = PREFIX + 'gcc'

0 commit comments

Comments
 (0)