Skip to content

Commit 2540e1b

Browse files
committed
do not set deprecated target args
I was unable to set a setup arg via `target_args`, because the value would be overridden by the empty value in `setup_args`. And if I tried to set `setup_args` I got a fail saying it was deprecated.
1 parent 146b208 commit 2540e1b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

foreign_cc/meson.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ def _create_meson_script(configureParameters):
125125
]
126126

127127
for target_name, args_ in deprecated:
128-
if args_ and target_name in target_args:
129-
fail("Please migrate '{t}_args' to 'target_args[\"{t}\"]'".format(t = target_name))
130-
131-
target_args[target_name] = args_
128+
if args_:
129+
if target_name in target_args:
130+
fail("Please migrate '{t}_args' to 'target_args[\"{t}\"]'".format(t = target_name))
131+
target_args[target_name] = args_
132132

133133
# --- TODO: DEPRECATED, delete on a future release ------------------------
134134

0 commit comments

Comments
 (0)