@@ -22,7 +22,7 @@ AR = $AR
22
22
EXTRA_CFLAGS =
23
23
CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS \$(EXTRA_CFLAGS)
24
24
RUST_FLAGS =
25
- NXT_OTEL_LIB_LOC =
25
+ NXT_OTEL_LIB_STATIC =
26
26
27
27
NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT
28
28
NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT
@@ -85,9 +85,9 @@ if [ $NXT_OTEL = YES ]; then
85
85
cat << END >> $NXT_MAKEFILE
86
86
87
87
ifeq (\$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
89
89
else
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
91
91
endif
92
92
93
93
END
@@ -154,14 +154,14 @@ cat << END >> $NXT_MAKEFILE
154
154
155
155
libnxt: $NXT_BUILD_DIR/lib/$NXT_LIB_SHARED $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
156
156
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 )
158
158
\$(PP_LD) \$@
159
159
\$(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 )
161
161
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 )
163
163
\$(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 )
165
165
166
166
$NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC: \$(NXT_LIB_UNIT_OBJS) \\
167
167
$NXT_BUILD_DIR/share/pkgconfig/unit.pc \\
@@ -375,11 +375,11 @@ $echo >> $NXT_MAKEFILE
375
375
cat << END >> $NXT_MAKEFILE
376
376
377
377
$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 )
379
379
\$(PP_LD) \$@
380
380
\$(v)\$(NXT_EXEC_LINK) -o \$@ \$(CFLAGS) \\
381
381
\$(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 )
383
383
384
384
END
385
385
@@ -580,7 +580,7 @@ NXT_OTEL_DEPS=" \
580
580
581
581
cat << END >> $NXT_MAKEFILE
582
582
583
- \$(NXT_OTEL_LIB_LOC ): $NXT_OTEL_DEPS
583
+ \$(NXT_OTEL_LIB_STATIC ): $NXT_OTEL_DEPS
584
584
cargo build \$(RUST_FLAGS) --manifest-path $NXT_OTEL_LIB_DIR/Cargo.toml
585
585
END
586
586
fi
0 commit comments