alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-10 00:00:24 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #194 from intelfx/work/makefile-nonrecursive

Browse Source 
Makefile: do not recursively expand flags (speed up parallel builds considerably)
This commit is contained in:
koverstreet 2023-12-22 04:49:58 -05:00 committed by GitHub
commit e962ffb769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -21,6 +21,10 @@ else
CARGO_CLEAN_ARGS = --quiet CARGO_CLEAN_ARGS = --quiet
endif endif
# Prevent recursive expansions of $(CFLAGS) to avoid repeatedly performing
# compile tests
CFLAGS:=$(CFLAGS)
CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \ CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \
-Wno-pointer-sign \ -Wno-pointer-sign \
-Wno-deprecated-declarations \ -Wno-deprecated-declarations \
@ -38,6 +42,9 @@ CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \
-DNO_BCACHEFS_SYSFS \ -DNO_BCACHEFS_SYSFS \
-DVERSION_STRING='"$(VERSION)"' \ -DVERSION_STRING='"$(VERSION)"' \
$(EXTRA_CFLAGS) $(EXTRA_CFLAGS)
# Intenionally not doing the above to $(LDFLAGS) because we rely on
# recursive expansion here (CFLAGS is not yet completely built by this line)
LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS) LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS)
ifdef CARGO_TOOLCHAIN_VERSION ifdef CARGO_TOOLCHAIN_VERSION
@ -154,11 +161,11 @@ TAGS:
tags: tags:
ctags -R . ctags -R .
SRCS=$(sort $(shell find . -type f ! -path '*/.*/*' -iname '*.c')) SRCS:=$(sort $(shell find . -type f ! -path '*/.*/*' -iname '*.c'))
DEPS=$(SRCS:.c=.d) DEPS:=$(SRCS:.c=.d)
-include $(DEPS) -include $(DEPS)
OBJS=$(SRCS:.c=.o) OBJS:=$(SRCS:.c=.o)
%.o: %.c %.o: %.c
@echo " [CC] $@" @echo " [CC] $@"
@ -180,7 +187,7 @@ libbcachefs.a: $(filter-out ./tests/%.o, $(OBJS))
@echo " [AR] $@" @echo " [AR] $@"
$(Q)ar -rc $@ $+ $(Q)ar -rc $@ $+
RUST_SRCS=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs') RUST_SRCS:=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs')
rust-src/target/release/libbcachefs_rust.a: $(RUST_SRCS) rust-src/target/release/libbcachefs_rust.a: $(RUST_SRCS)
$(CARGO_BUILD) $(CARGO_BUILD)