aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2019-04-09 18:05:00 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2019-04-23 11:22:49 +0100
commit42e9028868bdbf0c9e007bf446608c6eba4077bc (patch)
treee99f94fb3fdf69aacf9c7864a563db8eb89a4f50
parentadd821db64b3c1fd7568736aaa67de53ad382eb4 (diff)
downloadmeson-42e9028868bdbf0c9e007bf446608c6eba4077bc.zip
meson-42e9028868bdbf0c9e007bf446608c6eba4077bc.tar.gz
meson-42e9028868bdbf0c9e007bf446608c6eba4077bc.tar.bz2
ninja: Remove use of unset ninja variable 'aliasing'
Setting this variable to contain additional commands to symlink shlib aliases was removed in commit c0bf3e8d, so it's always unset now, and thus does nothing.
-rw-r--r--mesonbuild/backend/ninjabackend.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 8edaeec..89fa543 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1473,10 +1473,10 @@ int dummy;
if compiler.can_linker_accept_rsp():
command_template = ''' command = {executable} @$out.rsp
rspfile = $out.rsp
- rspfile_content = $ARGS {output_args} $in $LINK_ARGS $aliasing
+ rspfile_content = $ARGS {output_args} $in $LINK_ARGS
'''
else:
- command_template = ' command = {executable} $ARGS {output_args} $in $LINK_ARGS $aliasing\n'
+ command_template = ' command = {executable} $ARGS {output_args} $in $LINK_ARGS\n'
command = command_template.format(
executable=' '.join(compiler.get_linker_exelist()),
output_args=' '.join(compiler.get_linker_output_args('$out'))