diff options
| author |  Hal Canary <halcanary@google.com> | 2018-02-09 14:45:09 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-10 00:15:31 +0000 |
| commit | e1053eaca2447b79fb878fc7fc54b3767c03bc8b (patch) | |
| tree | 9a59cb371ceb4d77fbfe9c39b73d25f1bef5894c /gn/toolchain | |
| parent | 4fd07349bf322692079ab63be9e7311d63b4f625 (diff) | |
BUILD: link and solink uses rsp file
Motivation: building for android on windows was failing for me.
Change-Id: Ia74bb99331edbe2cc9b0281e4c9ff7bbc00b08e6
Reviewed-on: https://skia-review.googlesource.com/106262
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'gn/toolchain')
| -rw-r--r-- | gn/toolchain/BUILD.gn | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn index 76de226530..4cfd886fcf 100644 --- a/gn/toolchain/BUILD.gn +++ b/gn/toolchain/BUILD.gn @@ -251,7 +251,9 @@ template("gcc_like_toolchain") { rpath = "-Wl,-install_name,@rpath/$soname" } - command = "$cc_wrapper $cxx -shared {{ldflags}} {{inputs}} {{solibs}} {{libs}} $rpath -o {{output}}" + rspfile = "{{output}}.rsp" + rspfile_content = "{{inputs}}" + command = "$cc_wrapper $cxx -shared {{ldflags}} @$rspfile {{solibs}} {{libs}} $rpath -o {{output}}" outputs = [ "{{root_out_dir}}/$soname", ] @@ -261,7 +263,9 @@ template("gcc_like_toolchain") { } tool("link") { - command = "$cc_wrapper $cxx {{ldflags}} {{inputs}} {{solibs}} {{libs}} -o {{output}}" + rspfile = "{{output}}.rsp" + rspfile_content = "{{inputs}}" + command = "$cc_wrapper $cxx {{ldflags}} @$rspfile {{solibs}} {{libs}} -o {{output}}" outputs = [ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}", ] |