summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkoverstreet <kent.overstreet@gmail.com>2025-04-14 14:15:55 -0500
committerGitHub <noreply@github.com>2025-04-14 14:15:55 -0500
commitbb0107dce78d1bf5af1499ba8556550969b8ad4a (patch)
treec86a8afe28c6d788965b5200ca7035b8107dda61
parentc9ee6467183b224b40ca437fd23eeabe0ae6a158 (diff)
parent96e82871a4895732fe900fe3c2960af09fd0dfb1 (diff)
Merge pull request #375 from xarblu/user-rustflags
Preserve RUSTFLAGS from environment
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9249c1b9..7d1812ce 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ CFLAGS+=$(call cc-disable-warning, zero-length-array)
CFLAGS+=$(call cc-disable-warning, shift-overflow)
CFLAGS+=$(call cc-disable-warning, enum-conversion)
CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end)
-export RUSTFLAGS=-C default-linker-libraries
+export RUSTFLAGS:=$(RUSTFLAGS) -C default-linker-libraries
PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils"
ifdef BCACHEFS_FUSE