Skip to content

Commit e59d8b8

Browse files
committed
fix: name conflict in example build scripts
${ngx_module}_MODULES set by auto/module can overwrite our internal variable and break the build if $ngx_module matches $ngx_addon_id.
1 parent 617c349 commit e59d8b8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

examples/auto/rust

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,12 @@ ngx_rust_module () {
247247
# Module deps are usually added to the object file targets, but we don't have any
248248
LINK_DEPS="$LINK_DEPS $ngx_rust_obj"
249249

250-
eval ${ngx_addon_id}_MODULES=\"\$${ngx_addon_id}_MODULES \
251-
$ngx_rust_target_type:$ngx_rust_target_name\"
250+
eval ${ngx_addon_id}_RUST_TARGETS=\"\$${ngx_addon_id}_RUST_TARGETS \
251+
$ngx_rust_target_type:$ngx_rust_target_name\"
252252

253253
if [ -n "$ngx_rust_target_features" ]; then
254-
eval ${ngx_addon_id}_FEATURES=\"\$${ngx_addon_id}_FEATURES \
255-
$ngx_rust_target_features\"
254+
eval ${ngx_addon_id}_RUST_FEATURES=\"\$${ngx_addon_id}_RUST_FEATURES \
255+
$ngx_rust_target_features\"
256256
fi
257257

258258
. auto/module
@@ -268,12 +268,12 @@ ngx_rust_make_modules () {
268268
ngx_addon_id=$(echo "$ngx_addon_name" | sed -e 's/[^A-Za-z0-9_]/_/g')
269269
ngx_cargo_manifest=${ngx_cargo_manifest:-"$ngx_addon_dir/Cargo.toml"}
270270

271-
eval ngx_rust_features="\$${ngx_addon_id}_FEATURES"
272-
eval ngx_rust_modules="\$${ngx_addon_id}_MODULES"
271+
eval ngx_rust_features="\$${ngx_addon_id}_RUST_FEATURES"
272+
eval ngx_rust_targets="\$${ngx_addon_id}_RUST_TARGETS"
273273

274-
for module in $ngx_rust_modules; do
275-
ngx_rust_target_type=${module%%:*}
276-
ngx_rust_target_name=${module#*:}
274+
for target in $ngx_rust_targets; do
275+
ngx_rust_target_type=${target%%:*}
276+
ngx_rust_target_name=${target#*:}
277277

278278
ngx_rust_make_module
279279
done

0 commit comments

Comments
 (0)