Skip to content

Commit bfb86ed

Browse files
remicolletac000
authored andcommitted
auto/make: Add missing NXT_OTEL_LIB_STATIC to some C tests
Fixes: 9d3dcb8 ("otel: add build tooling to include otel code") [ Commit subject, s/NXT_OTEL_LIB_LOC/NXT_OTEL_LIB_STATIC/ and placement of NXT_OTEL_LIB_STATIC tweaked as per @thresheek - Andrew ] Signed-off-by: Andrew Clayton <[email protected]>
1 parent 854a52c commit bfb86ed

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

auto/make

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -265,36 +265,40 @@ tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\
265265
$NXT_BUILD_DIR/unit_websocket_echo
266266

267267
$NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\
268-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
268+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
269+
\$(NXT_OTEL_LIB_STATIC)
269270
\$(PP_LD) \$@
270271
\$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\
271272
\$(CFLAGS) \$(NXT_TEST_OBJS) \\
272-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
273+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
273274
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
274275

275276
$NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\
276-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
277+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
278+
\$(NXT_OTEL_LIB_STATIC)
277279
\$(PP_LD) \$@
278280
\$(v)\$(CC) \$(CFLAGS) \$(NXT_LIB_INCS) $NXT_LIB_AUX_CFLAGS \\
279281
-o $NXT_BUILD_DIR/utf8_file_name_test \\
280282
$NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\
281-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
283+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
282284
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
283285

284286
$NXT_BUILD_DIR/ncq_test: $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\
285-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
287+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
288+
\$(NXT_OTEL_LIB_STATIC)
286289
\$(PP_LD) \$@
287290
\$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/ncq_test \\
288291
\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\
289-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
292+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
290293
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
291294

292295
$NXT_BUILD_DIR/vbcq_test: $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\
293-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
296+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
297+
\$(NXT_OTEL_LIB_STATIC)
294298
\$(PP_LD) \$@
295299
\$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/vbcq_test \\
296300
\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\
297-
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
301+
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
298302
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
299303

300304
$NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\

0 commit comments

Comments
 (0)