Skip to content

Commit f4e7619

Browse files
[RISCV] Try to fix linker error for rv32 (#231)
Currently the buildbot is failing to find lld, so I added a few flags I use locally to force cmake to use lld.
1 parent f6af50a commit f4e7619

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

zorg/buildbot/builders/annotated/libc-linux.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,15 @@ def main(argv):
9999
cmake_args.extend(['-DLLVM_LIBC_FULL_BUILD=ON']),
100100

101101
if riscv32_build:
102-
cmake_args.append('-DCMAKE_C_FLAGS=-mabi=ilp32d -march=rv32imafdc \
103-
--target=riscv32-unknown-linux-gnu --sysroot=/opt/riscv/sysroot \
104-
--gcc-toolchain=/opt/riscv')
105-
cmake_args.append('-DCMAKE_CXX_FLAGS=-mabi=ilp32d -march=rv32imafdc \
106-
--target=riscv32-unknown-linux-gnu --sysroot=/opt/riscv/sysroot \
107-
--gcc-toolchain=/opt/riscv')
102+
cmake_args.append('-DCMAKE_C_FLAGS=-mabi=ilp32d -march=rv32imafdc --target=riscv32-unknown-linux-gnu --sysroot=/opt/riscv/sysroot --gcc-toolchain=/opt/riscv')
103+
cmake_args.append('-DCMAKE_CXX_FLAGS=-mabi=ilp32d -march=rv32imafdc --target=riscv32-unknown-linux-gnu --sysroot=/opt/riscv/sysroot --gcc-toolchain=/opt/riscv')
108104
cmake_args.append('-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld')
109105
cmake_args.append('-DCMAKE_CROSSCOMPILING_EMULATOR={}/cross.sh'.format(os.getenv('HOME')))
110106
cmake_args.append('-DLIBC_TARGET_TRIPLE=riscv32-unknown-linux-gnu')
111107
cmake_args.append('-DCMAKE_SYSTEM_NAME=Linux')
108+
cmake_args.append('-DLLVM_HOST_TRIPLE=riscv32-unknown-linux-gnu')
109+
cmake_args.append('-DLLVM_TARGETS_TO_BUILD=RISCV')
110+
cmake_args.append('-DCMAKE_LINKER=/usr/bin/ld.lld')
112111

113112
run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args)
114113

0 commit comments

Comments
 (0)