From 9ad716ed3998eb41033a59e60127669cd169b049 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 30 Jul 2019 14:17:58 +0000 Subject: [PATCH] gn build: Use rebase_path on filename args to libcxx/utils/gen_link_script.py $ ninja -j800 [1/5] ACTION //libcxx/src:cxx_linker_script(//llvm/utils/gn/build/toolchain:stage2_unix) FAILED: lib/libc++.so python ../libcxx/utils/gen_link_script.py --input //build.gn/lib/libc++.so.0 --output //build.gn/lib/libc++.so c++abi unwind GENERATING SCRIPT: 'INPUT(libc++.so.0 -lc++abi -lunwind)' as file //build.gn/lib/libc++.so Traceback (most recent call last): File "../libcxx/utils/gen_link_script.py", line 57, in sys.exit(main()) File "../libcxx/utils/gen_link_script.py", line 50, in main with open(args.output, 'w') as f: IOError: [Errno 2] No such file or directory: '//build.gn/lib/libc++.so' ninja: build stopped: subcommand failed. Differential revision: https://reviews.llvm.org/D65449 llvm-svn: 367314 --- llvm/utils/gn/secondary/libcxx/src/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn index 09b8947..8f5c1c3 100644 --- a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn +++ b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn @@ -236,9 +236,9 @@ if (libcxx_enable_shared) { ] args = [ "--input", - "$runtimes_dir/libc++.so.0", + rebase_path("$runtimes_dir/libc++.so.0", root_build_dir), "--output", - "$runtimes_dir/libc++.so", + rebase_path("$runtimes_dir/libc++.so", root_build_dir), "c++abi", "unwind", ] -- 2.7.4