Skip to content

Commit

Permalink
[libcxx] Use relative path for libc++ library when generating script
Browse files Browse the repository at this point in the history
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
  • Loading branch information
petrhosek committed Apr 23, 2019
1 parent 9766bf1 commit 80b578c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion libcxx/utils/gen_link_script.py
Expand Up @@ -29,11 +29,14 @@ def main():
help="List of libraries libc++ depends on")
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.
public_libs = ['-l%s' % l for l in args.libraries]

# 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))

if args.dryrun:
Expand Down

0 comments on commit 80b578c

Please sign in to comment.