Skip to content

build: fix axiom's build dependency check #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

build: fix axiom's build dependency check #1031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions axiom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@ nr_config.h: configure Makefile
#
# Build the 8T protobuf code.
#
v1.pb-c.c: v1.proto protobuf-c
v1.pb-c.c: v1.proto
ifeq (0,$(HAVE_PROTOBUF_C))
$(error Build dependency 'protobuf-c' not found.)
endif
$(PROTOBUF_C_PREFIX)/bin/protoc-c --c_out=. $<

#
Expand All @@ -205,12 +208,6 @@ v1.pb-c.c: v1.proto protobuf-c
v1.pb-c.o: v1.pb-c.c
$(CC) $(AXIOM_CPPFLAGS) $(CPPFLAGS) $(AXIOM_CFLAGS) $(PCRE_CFLAGS) $(VENDOR_CFLAGS) $(CFLAGS) -MMD -MP -Wno-cast-qual -c $< -o $@

.PHONY: protobuf-c
protobuf-c:
ifeq (0,$(HAVE_PROTOBUF_C))
$(error Build dependency 'protobuf-c' not found.)
endif

#
# Track the flags passed to the compiler to force a rebuild when they change.
# This ensures a rebuild occurs when the version number or commit are updated.
Expand Down
Loading