github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2024-11-22 11:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile: don't touch LDFLAGS

Browse Source 
These are more like LIBS rather than LDFLAGS.
They are used just in one place,
so simply put them inline.

Also, use LDFLAGS provided by the user during actual link.

This helps users pass their own LDFLAGS.
For example, this is important on Gentoo,
where LDFLAGS='-Wl,-O1 -Wl,--as-needed' is passed by default.
This commit is contained in:
Andrey Mazo 2018-08-12 07:24:39 +03:00
parent b1ecc58114
commit e987ff46c2
No known key found for this signature in database
GPG Key ID: 8D30814ABF01E3CF
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -58,7 +58,6 @@ CFLAGS = -g -Wall \
-DFUSE_USE_VERSION=29 \
-MMD \
-DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)
LDFLAGS = -pthread -lrt
PREFIX = /usr/local
EXEC_PREFIX = $(PREFIX)
@ -86,7 +85,7 @@ help:
$(TARGET): version obj/obj-stamp libfuse/lib/.libs/libfuse.a $(OBJ)
cd libfuse && make
$(CXX) $(CFLAGS) $(OBJ) -o $@ libfuse/lib/.libs/libfuse.a -ldl $(LDFLAGS)
$(CXX) $(CFLAGS) $(LDFLAGS) $(OBJ) -o $@ libfuse/lib/.libs/libfuse.a -ldl -pthread -lrt
mount.mergerfs: $(TARGET)
$(LN) -fs "$<" "$@"
@ -208,7 +207,7 @@ else ifeq ($(shell test -e /usr/bin/yum; echo $$?),0)
yum -y install git rpm-build libattr-devel gcc-c++ make which python automake libtool gettext-devel
endif
unexport CFLAGS LDFLAGS
unexport CFLAGS
.PHONY: libfuse_Makefile
libfuse_Makefile:
ifeq ($(shell test -e libfuse/Makefile; echo $$?),1)