[llvm] r367314 - gn build: Use rebase_path on filename args to libcxx/utils/gen_link_script.py

[Hans Wennborg via llvm-commits]

Merged to release_90 in r367315.

On Tue, Jul 30, 2019 at 4:17 PM Hans Wennborg via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: hans
> Date: Tue Jul 30 07:17:58 2019
> New Revision: 367314
>
> URL: http://llvm.org/viewvc/llvm-project?rev=367314&view=rev
> Log:
> 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 <module>
>       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
>
> Modified:
>     llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn
>
> Modified: llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn?rev=367314&r1=367313&r2=367314&view=diff
> ==============================================================================
> --- llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn (original)
> +++ llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn Tue Jul 30 07:17:58 2019
> @@ -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",
>        ]
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits