Skip to content

Commit cd9993d

Browse files
Bastian Blanklenticularis39
authored andcommitted
rtla: Also link in ctype.c
rtla started to only link parts of the tools library. It now misses the ctype information used by all the related string operations. Just add another single file to make it build again. Signed-off-by: Bastian Blank <waldi@debian.org> Fixes: 48209d7 ("rtla: Add libsubcmd dependency") Link: https://lore.kernel.org/r/ako2S4mzIqWwYuas@steamhammer.waldi.eu.org [ remove duplicated spaces in commit message ] Signed-off-by: Tomas Glozar <tglozar@redhat.com>
1 parent 4d6941c commit cd9993d

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

tools/tracing/rtla/Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ else
4545
LIB_OUTPUT = $(CURDIR)/lib
4646
endif
4747

48+
LIB_CTYPE = $(LIB_OUTPUT)/ctype.o
49+
LIB_CTYPE_SRC = $(srctree)/tools/lib/ctype.c
50+
4851
LIB_STRING = $(LIB_OUTPUT)/string.o
4952
LIB_STRING_SRC = $(srctree)/tools/lib/string.c
5053

@@ -117,12 +120,12 @@ tests/bpf/bpf_action_map.o: tests/bpf/bpf_action_map.c
117120
$(Q)echo "BPF skeleton support is disabled, skipping tests/bpf/bpf_action_map.o"
118121
endif
119122

120-
$(RTLA): $(RTLA_IN) $(LIBSUBCMD) $(LIB_STRING) $(LIB_STR_ERROR_R)
121-
$(QUIET_LINK)$(CC) $(LDFLAGS) -o $(RTLA) $(RTLA_IN) $(LIBSUBCMD) $(LIB_STRING) $(LIB_STR_ERROR_R) $(EXTLIBS)
123+
$(RTLA): $(RTLA_IN) $(LIBSUBCMD) $(LIB_CTYPE) $(LIB_STRING) $(LIB_STR_ERROR_R)
124+
$(QUIET_LINK)$(CC) $(LDFLAGS) -o $(RTLA) $(RTLA_IN) $(LIBSUBCMD) $(LIB_CTYPE) $(LIB_STRING) $(LIB_STR_ERROR_R) $(EXTLIBS)
122125

123-
static: $(RTLA_IN) $(LIBSUBCMD) $(LIB_STRING) $(LIB_STR_ERROR_R)
126+
static: $(RTLA_IN) $(LIBSUBCMD) $(LIB_CTYPE) $(LIB_STRING) $(LIB_STR_ERROR_R)
124127
$(eval LDFLAGS += -static)
125-
$(QUIET_LINK)$(CC) -static $(LDFLAGS) -o $(RTLA)-static $(RTLA_IN) $(LIBSUBCMD) $(LIB_STRING) $(LIB_STR_ERROR_R) $(EXTLIBS)
128+
$(QUIET_LINK)$(CC) -static $(LDFLAGS) -o $(RTLA)-static $(RTLA_IN) $(LIBSUBCMD) $(LIB_CTYPE) $(LIB_STRING) $(LIB_STR_ERROR_R) $(EXTLIBS)
126129

127130
rtla.%: fixdep FORCE
128131
make -f $(srctree)/tools/build/Makefile.build dir=. $@
@@ -150,6 +153,9 @@ $(LIB_STR_ERROR_R): $(LIB_STR_ERROR_R_SRC) | $(LIB_OUTPUT)
150153
$(LIB_STRING): $(LIB_STRING_SRC) | $(LIB_OUTPUT)
151154
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
152155

156+
$(LIB_CTYPE): $(LIB_CTYPE_SRC) | $(LIB_OUTPUT)
157+
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
158+
153159
libsubcmd-clean:
154160
$(call QUIET_CLEAN, libsubcmd)
155161
$(Q)$(RM) -r -- $(LIBSUBCMD_OUTPUT)

0 commit comments

Comments
 (0)