@@ -22,7 +22,7 @@ AR = $AR
2222EXTRA_CFLAGS =
2323CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS \$(EXTRA_CFLAGS)
2424RUST_FLAGS =
25- NXT_OTEL_LIB_LOC =
25+ NXT_OTEL_LIB_STATIC =
2626
2727NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT
2828NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT
@@ -85,9 +85,9 @@ if [ $NXT_OTEL = YES ]; then
8585cat << END >> $NXT_MAKEFILE
8686
8787ifeq (\$D,1)
88- NXT_OTEL_LIB_LOC = $NXT_OTEL_LIB_DIR/target/debug/libotel.a
88+ NXT_OTEL_LIB_STATIC = $NXT_OTEL_LIB_DIR/target/debug/libotel.a
8989else
90- NXT_OTEL_LIB_LOC = $NXT_OTEL_LIB_DIR/target/release/libotel.a
90+ NXT_OTEL_LIB_STATIC = $NXT_OTEL_LIB_DIR/target/release/libotel.a
9191endif
9292
9393END
@@ -154,14 +154,14 @@ cat << END >> $NXT_MAKEFILE
154154
155155libnxt: $NXT_BUILD_DIR/lib/$NXT_LIB_SHARED $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
156156
157- $NXT_BUILD_DIR/lib/$NXT_LIB_SHARED: \$(NXT_LIB_OBJS) \$(NXT_OTEL_LIB_LOC )
157+ $NXT_BUILD_DIR/lib/$NXT_LIB_SHARED: \$(NXT_LIB_OBJS) \$(NXT_OTEL_LIB_STATIC )
158158 \$(PP_LD) \$@
159159 \$(v)\$(NXT_SHARED_LOCAL_LINK) -o \$@ \$(NXT_LIB_OBJS) \\
160- $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC )
160+ $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_STATIC )
161161
162- $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC: \$(NXT_LIB_OBJS) \$(NXT_OTEL_LIB_LOC )
162+ $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC: \$(NXT_LIB_OBJS) \$(NXT_OTEL_LIB_STATIC )
163163 \$(PP_AR) \$@
164- \$(v)$NXT_STATIC_LINK \$@ \$(NXT_LIB_OBJS) \$(NXT_OTEL_LIB_LOC )
164+ \$(v)$NXT_STATIC_LINK \$@ \$(NXT_LIB_OBJS) \$(NXT_OTEL_LIB_STATIC )
165165
166166$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC: \$(NXT_LIB_UNIT_OBJS) \\
167167 $NXT_BUILD_DIR/share/pkgconfig/unit.pc \\
@@ -375,11 +375,11 @@ $echo >> $NXT_MAKEFILE
375375cat << END >> $NXT_MAKEFILE
376376
377377$NXT_BUILD_DIR/sbin/$NXT_DAEMON: $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
378- \$(NXT_OBJS) \$(NXT_OTEL_LIB_LOC )
378+ \$(NXT_OBJS) \$(NXT_OTEL_LIB_STATIC )
379379 \$(PP_LD) \$@
380380 \$(v)\$(NXT_EXEC_LINK) -o \$@ \$(CFLAGS) \\
381381 \$(NXT_OBJS) $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
382- $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC )
382+ $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_STATIC )
383383
384384END
385385
@@ -580,7 +580,7 @@ NXT_OTEL_DEPS=" \
580580
581581 cat << END >> $NXT_MAKEFILE
582582
583- \$(NXT_OTEL_LIB_LOC ): $NXT_OTEL_DEPS
583+ \$(NXT_OTEL_LIB_STATIC ): $NXT_OTEL_DEPS
584584 cargo build \$(RUST_FLAGS) --manifest-path $NXT_OTEL_LIB_DIR/Cargo.toml
585585END
586586fi
0 commit comments