Commit a2ed4344 authored by yyanagisawa's avatar yyanagisawa Committed by Commit bot

Should use sofile instead of soname.

If soname is used here, nm cannot find the file if non-default
toolchain is used.

Review URL: https://codereview.chromium.org/884663002

Cr-Commit-Position: refs/heads/master@{#313639}
parent 70091e75
...@@ -138,7 +138,7 @@ template("gcc_toolchain") { ...@@ -138,7 +138,7 @@ template("gcc_toolchain") {
temporary_tocname = sofile + ".tmp" temporary_tocname = sofile + ".tmp"
link_command = link_command =
"$ld -shared {{ldflags}} -o $sofile -Wl,-soname=$soname @$rspfile" "$ld -shared {{ldflags}} -o $sofile -Wl,-soname=$soname @$rspfile"
toc_command = "{ readelf -d $sofile | grep SONAME ; nm -gD -f p $soname | cut -f1-2 -d' '; } > $temporary_tocname" toc_command = "{ readelf -d $sofile | grep SONAME ; nm -gD -f p $sofile | cut -f1-2 -d' '; } > $temporary_tocname"
replace_command = "if ! cmp -s $temporary_tocname $tocfile; then mv $temporary_tocname $tocfile; fi" replace_command = "if ! cmp -s $temporary_tocname $tocfile; then mv $temporary_tocname $tocfile; fi"
command = "$link_command && $toc_command && $replace_command" command = "$link_command && $toc_command && $replace_command"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment