[libcxx] Use relative path for libc++ library when generating script

This addresses the issue introduced in D60309 which leads to linker
scripts being generated with absolute paths.

Differential Revision: https://reviews.llvm.org/D61039

llvm-svn: 359045
This commit is contained in:
Petr Hosek 2019-04-23 22:55:28 +00:00
parent 9766bf1854
commit 80b578c732

View File

@ -29,11 +29,14 @@ def main():
help="List of libraries libc++ depends on") help="List of libraries libc++ depends on")
args = parser.parse_args() args = parser.parse_args()
# Use the relative path for the libc++ library.
libcxx = os.path.relpath(args.input, os.path.dirname(args.output))
# Prepare the list of public libraries to link. # Prepare the list of public libraries to link.
public_libs = ['-l%s' % l for l in args.libraries] public_libs = ['-l%s' % l for l in args.libraries]
# Generate the linker script contents. # Generate the linker script contents.
contents = "INPUT(%s)" % ' '.join([args.input] + public_libs) contents = "INPUT(%s)" % ' '.join([libcxx] + public_libs)
print("GENERATING SCRIPT: '%s' as file %s" % (contents, args.output)) print("GENERATING SCRIPT: '%s' as file %s" % (contents, args.output))
if args.dryrun: if args.dryrun: