From 2d937b9c3c1ca7a82ec5a00c7842a8a8254d24fa Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Wed, 28 May 2025 11:49:44 +0200 Subject: [PATCH] simplify conditional logic with constructed macro names based on https://make.mad-scientist.net/constructed-macro-names/ --- example/Makefile | 151 +++++++++++++++++------------------- example/src/header_logger.c | 2 +- flake.lock | 6 +- 3 files changed, 75 insertions(+), 84 deletions(-) diff --git a/example/Makefile b/example/Makefile index 0a865ac..c2e75bb 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,98 +1,89 @@ CARGO ?= cargo STRIP ?= strip +CC ?= gcc -FEATURES := "env_logger" +RUST_ARCH ?= x86_64 + +FEATURES := ""#"env_logger" THIS_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) REPO_ROOT := $(realpath $(THIS_DIR)/..) export SERVICEPOINT_HEADER_OUT := $(REPO_ROOT)/include -override CFG_MUSL := $(if $(CFG_MUSL),$(CFG_MUSL),$(if $(MUSL),$(MUSL),0)) -override CFG_PROFILE := $(if $(CFG_PROFILE),$(CFG_PROFILE),$(if $(PROFILE),$(PROFILE),release)) +# TODO: check if override is needed +override _libc := $(if $(MUSL),musl,gnu) +override _profile := $(if $(PROFILE),$(PROFILE),release) +override _rust_cli_profile := $(if $(filter $(_profile),debug),dev,$(_profile)) +override _link_type := $(if $(LINK),$(LINK),dynamic) -CCFLAGS += -Wall -Wextra -pedantic -fwhole-program -fPIE -pie +# TODO: make LINK=static fails with linker error "undefined reference to `_dl_find_object'" in libgcc_eh.a -STRIPFLAGS := -s --strip-unneeded -R .comment -R .gnu.version -R .note -R .note.gnu.build-id -R .note.ABI-tag - -#ifeq ($(CFG_PROFILE), size-optimized) -# CCFLAGS += -nodefaultlibs -lc -#endif - -STATIC_LINK_LIBS := -lservicepoint_binding_c - -ifeq ($(CFG_PROFILE), size-optimized) - CARGO_PROFILE := size-optimized - CCFLAGS += -Oz \ - -fwrapv -fomit-frame-pointer -fno-stack-protector\ - -fno-unroll-loops \ - -fno-unwind-tables -fno-asynchronous-unwind-tables \ - -fmerge-all-constants \ - -Wl,-z,norelro \ - -Wl,--hash-style=gnu \ - -fvisibility=hidden \ - -Bsymbolic \ - -Wl,--exclude-libs,ALL \ - -fno-ident \ - -fno-exceptions - CARGOFLAGS += -Zbuild-std="core,std,alloc,proc_macro,panic_abort" \ - -Zbuild-std-features="panic_immediate_abort" - RUSTFLAGS += -Zlocation-detail=none \ - -Zfmt-debug=none \ - -C link-arg=-z,norelro \ - -C panic=abort - #-C link-arg=--hash-style=gnu -else - FEATURES := $(FEATURES),all_compressions - STATIC_LINK_LIBS += -llzma - ifeq ($(CFG_PROFILE), release) - CARGO_PROFILE := release - CCFLAGS += -O2 - else ifeq ($(CFG_PROFILE), debug) - CCFLAGS += -Og - CARGO_PROFILE := dev - else - CFG_PROFILE := $(error "PROFILE has to be set to one of: debug, release, size-optimized") - endif +_all_profiles := release debug size-optimized +ifeq (,$(filter $(_all_profiles),$(_profile))) + _profile := $(error "PROFILE has to be set to one of: debug, release, size-optimized") endif +STRIPFLAGS += -s --strip-unneeded -R .comment -R .gnu.version -R .note -R .note.gnu.build-id -R .note.ABI-tag +STATIC_LINK_LIBS += -lservicepoint_binding_c -ifeq ($(CFG_MUSL), 1) - TARGET ?= x86_64-unknown-linux-musl - CC ?= musl-gcc - CCFLAGS += -static $(STATIC_LINK_LIBS) - RUSTFLAGS += --crate-type=staticlib -Ctarget-feature=-crt-static -else - TARGET ?= x86_64-unknown-linux-gnu - CC ?= gcc - #CCFLAGS += -shared - CCFLAGS += -Wl,-Bstatic $(STATIC_LINK_LIBS) -Wl,-Bdynamic -endif - +RUST_TARGET := $(RUST_ARCH)-unknown-linux-$(_libc) +size-optimized_CARGOFLAGS += -Zbuild-std="core,std,alloc,proc_macro,panic_abort" \ + -Zbuild-std-features="panic_immediate_abort" CARGOFLAGS += --manifest-path=$(REPO_ROOT)/Cargo.toml \ - --profile=$(CARGO_PROFILE) \ + --profile=$(_rust_cli_profile) \ --no-default-features \ --features=$(FEATURES) \ - --target=$(TARGET) + --target=$(RUST_TARGET) \ + $($(_profile)_CARGOFLAGS) -ifneq ($(CFG_PROFILE), debug) - CCFLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections +CFLAGS += -Wall -Wextra -pedantic -fwhole-program -fPIE -pie +_no_debug_cflags := -ffunction-sections -fdata-sections -Wl,--gc-sections +size-optimized_CFLAGS += -Oz \ + -fwrapv -fomit-frame-pointer -fno-stack-protector\ + -fno-unroll-loops \ + -fno-unwind-tables -fno-asynchronous-unwind-tables \ + -fmerge-all-constants \ + -Wl,-z,norelro \ + -Wl,--hash-style=gnu \ + -fvisibility=hidden \ + -Bsymbolic \ + -Wl,--exclude-libs,ALL \ + -fno-ident \ + -fno-exceptions \ + $(_no_debug_cflags) +release_CFLAGS += -O2 \ + $(_no_debug_cflags) +debug_CFLAGS += -Og +static_CFLAGS += -static $(STATIC_LINK_LIBS) +dynamic_CFLAGS += -Wl,-Bstatic $(STATIC_LINK_LIBS) -Wl,-Bdynamic + +size-optimized_RUSTFLAGS += -Zlocation-detail=none \ + -Zfmt-debug=none \ + -C link-arg=-z,norelro \ + -C panic=abort + #-C link-arg=--hash-style=gnu +musl_RUSTFLAGS += --crate-type=staticlib -Ctarget-feature=-crt-static + +RUSTFLAGS += $($(_libc)_RUSTFLAGS) $($(_profile)_RUSTFLAGS) $($(_link_type)_RUSTFLAGS) +ifneq ($(_profile), debug) RUSTFLAGS += -C link-arg=-s -C link-arg=-Wl,--gc-sections endif +CFLAGS += $($(_libc)_CFLAGS) $($(_profile)_CFLAGS) $($(_link_type)_CFLAGS) ifeq ($(LTO), 1) - CCFLAGS += -flto + CFLAGS += -flto endif -RUST_TARGET_DIR := $(REPO_ROOT)/target/$(TARGET)/$(CFG_PROFILE) +RUST_TARGET_DIR := $(REPO_ROOT)/target/$(RUST_TARGET)/$(_profile) _c_src := $(wildcard ./src/*.c) _programs := $(basename $(notdir $(_c_src))) _bins := $(addprefix out/, $(_programs)) _unstripped_bins := $(addsuffix _unstripped, $(_bins)) _run_programs := $(addprefix run_, $(_programs)) -_rs_src := $(wildcard ../src/**.rs) ../Cargo.lock ../Cargo.toml ../cbindgen.toml -_sp_artifacts := $(SERVICEPOINT_HEADER_OUT)/servicepoint.h $(RUST_TARGET_DIR)/libservicepoint_binding_c.a $(RUST_TARGET_DIR)/libservicepoint_binding_c.so + +# TODO: use cargo --target-dir to put rust binaries into same dir all: $(_bins) @@ -105,33 +96,33 @@ clean-rust: rm $(SERVICEPOINT_HEADER_OUT)/servicepoint.h || true cargo clean -.PHONY: all clean sizes $(_run_programs) clean-c clean-rust +.PHONY: all clean sizes $(_run_programs) clean-c clean-rust build-rust help FORCE -$(_unstripped_bins): out/%_unstripped: src/%.c $(SERVICEPOINT_HEADER_OUT)/servicepoint.h src/helpers.h $(_sp_artifacts) +$(_unstripped_bins): out/%_unstripped: src/%.c src/helpers.h build-rust mkdir -p out || true $(CC) $< \ -I $(SERVICEPOINT_HEADER_OUT) \ -L $(RUST_TARGET_DIR) \ - $(CCFLAGS) \ + $(CFLAGS) \ -o $@ $(_bins): out/%: out/%_unstripped $(STRIP) $(STRIPFLAGS) $^ -o $@ -$(_sp_artifacts): $(_rs_src) +build-rust: FORCE mkdir -p $(SERVICEPOINT_HEADER_OUT) || true # generate servicepoint header and library to link against $(CARGO) rustc $(CARGOFLAGS) -- $(RUSTFLAGS) -$(_run_programs): run_%: out/% FORCE - ./$< - -sizes: $(_bins) - ls -lB out - -analyze-size: out/$(BIN)_unstripped - nm --print-size --size-sort --reverse-sort --radix=d --demangle out/$(BIN)_unstripped \ - | awk '{size=$$2+0; print size "\t" $$4}' \ - | less - FORCE: ; + +help: + @echo "You have the choice of the following parameters:" + @echo "" + @echo "Variable | Description | Default | Values" + @echo "---------+-----------------------------------+-----------+---------------------------" + @echo "CARGO | which cargo binary to use | 'cargo' | 'rustup run nightly cargo'" + @echo "CC | which C compiler to use | 'gcc' | 'musl-gcc'" + @echo "STRIP | which strip command to use | 'strip' | -" + @echo "MUSL | if set, use musl instead of glibc | unset | '1'" + @echo "PROFILE | Compilation profile | 'release' | 'debug' or 'size-optimized'" diff --git a/example/src/header_logger.c b/example/src/header_logger.c index a4ea051..93c17dd 100644 --- a/example/src/header_logger.c +++ b/example/src/header_logger.c @@ -16,7 +16,7 @@ void handle_error(const char *msg) { } int main(int argc, char **argv) { - init_env_logger(); + //init_env_logger(); int udp_socket = socket(AF_INET, SOCK_DGRAM, 0); if (udp_socket == -1) diff --git a/flake.lock b/flake.lock index ad77a01..c5f76d2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1747862697, - "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": {