[llvm-branch-commits] [llvm-branch] r367315 - Merging r367314:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Jul 30 07:18:50 2019
New Revision: 367315

URL: http://llvm.org/viewvc/llvm-project?rev=367315&view=rev
Log:
Merging r367314:
------------------------------------------------------------------------
r367314 | hans | 2019-07-30 16:17:58 +0200 (Tue, 30 Jul 2019) | 16 lines

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/branches/release_90/   (props changed)
    llvm/branches/release_90/utils/gn/secondary/libcxx/src/BUILD.gn

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 30 07:18:50 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366481,366527,366570,366925,367030,367062,367215
+/llvm/trunk:155241,366431,366481,366527,366570,366925,367030,367062,367215,367314

Modified: llvm/branches/release_90/utils/gn/secondary/libcxx/src/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/utils/gn/secondary/libcxx/src/BUILD.gn?rev=367315&r1=367314&r2=367315&view=diff
==============================================================================
--- llvm/branches/release_90/utils/gn/secondary/libcxx/src/BUILD.gn (original)
+++ llvm/branches/release_90/utils/gn/secondary/libcxx/src/BUILD.gn Tue Jul 30 07:18:50 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",
       ]