Skip to content

Commit 4f0726e

Browse files
committed
[smart] fix the vdso building issue in linux
1 parent 8494a41 commit 4f0726e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

components/lwp/vdso/SConscript

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ else:
2424
if not os.path.exists(cwd + "/user" + "/arch" +"/" + rtconfig.ARCH + "/vdso.lds"):
2525
Preprocessing("user/arch/" + rtconfig.ARCH + "/vdso.lds.S", ".lds", CPPPATH=[cwd])
2626

27-
vdso_file = os.path.join(cwd, 'user',"arch", rtconfig.ARCH, 'SConstruct')
27+
vdso_arch = os.path.join(cwd, 'user',"arch", rtconfig.ARCH)
2828

2929
process_env = os.environ.copy()
3030
if hasattr(rtconfig, 'EXEC_PATH') and rtconfig.EXEC_PATH is not None:
3131
process_env['EXEC_PATH'] = rtconfig.EXEC_PATH
3232
if hasattr(rtconfig, 'PREFIX') and rtconfig.PREFIX is not None:
3333
process_env['CC_PREFIX'] = rtconfig.PREFIX
3434

35-
command = ["scons", "-f", vdso_file]
36-
clean_command = ["scons", "-f", vdso_file, "--clean"]
35+
command = ["scons", "-C", vdso_arch]
36+
clean_command = ["scons", "-C", vdso_arch, "--clean"]
3737

3838
if not GetOption('clean'):
3939
result = subprocess.run(command, env=process_env, check=True)

components/lwp/vdso/user/arch/aarch64/SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import os
22
import sys
33

44
arguments = sys.argv[2]
5-
vdso_usr = os.path.dirname(arguments)
5+
vdso_usr = arguments
66
vdso_path = os.path.join(vdso_usr, '..', '..', '..')
77

88
EXEC_PATH = os.getenv('RTT_EXEC_PATH') or '/usr/bin'

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import os
22
import sys
33

44
arguments = sys.argv[2]
5-
vdso_usr = os.path.dirname(arguments)
5+
vdso_usr = arguments
66
vdso_path = os.path.join(vdso_usr, '..', '..', '..')
77

88
EXEC_PATH = os.getenv('RTT_EXEC_PATH') or '/usr/bin'
9-
PREFIX = os.getenv('RTT_CC_PREFIX') or 'aarch64-none-elf-'
9+
PREFIX = os.getenv('RTT_CC_PREFIX') or 'riscv64-none-elf-'
1010

1111
CC = PREFIX + 'gcc'
1212
CPP = PREFIX + 'cpp'
@@ -23,8 +23,8 @@ CFLAGS += " -I . -I {vdso_path} ".format(vdso_path=vdso_path)
2323
src = Glob('*.c')
2424
env = Environment(tools=['gcc', 'link'],
2525
AS = AS, ASFLAGS = AFLAGS,
26-
CC = CC, CFLAGS = CFLAGS,
27-
CPP = CPP, AR = AR,
26+
CC = CC, CFLAGS = CFLAGS,
27+
CPP = CPP, AR = AR,
2828
LINK = LINK, LINKFLAGS = LFLAGS)
2929
env.PrependENVPath('PATH', EXEC_PATH)
3030

0 commit comments

Comments
 (0)