From b304b40553b3c9543ab45c9b4f59d882e964c2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8E=B7=F0=9F=90=9B=20Lee=20Ball?= Date: Thu, 31 Dec 2020 19:20:17 -0800 Subject: [PATCH 1/4] Append user-defined CFLAGS Allow CFLAGS present in the user's environment be appended to EXTRA_CFLAGS. --- fs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/Makefile b/fs/Makefile index e3b6477..f5f4790 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -7,11 +7,11 @@ OSXFUSE_ROOT = /usr/local CFLAGS_EXTRA = -DFUSE_USE_VERSION=26 -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-function -g ifeq ($(shell uname -s),Linux) - CFLAGS = $(CFLAGS_EXTRA) + CFLAGS ::= $(CFLAGS_EXTRA) $(CFLAGS) LIBS = -lfuse endif ifeq ($(shell uname -s),Darwin) - CFLAGS = -I$(OSXFUSE_ROOT)/include/osxfuse/fuse -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS_EXTRA) + CFLAGS = -I$(OSXFUSE_ROOT)/include/osxfuse/fuse -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS_EXTRA) $(CFLAGS) LIBS = -losxfuse endif From cd9288619d9933827537a4bfd60e591c25b43b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8E=B7=F0=9F=90=9B=20Lee=20Ball?= Date: Thu, 31 Dec 2020 20:00:29 -0800 Subject: [PATCH 2/4] Append to environment CFLAGS if they exist. --- fs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/Makefile b/fs/Makefile index f5f4790..6d0b22d 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -7,7 +7,7 @@ OSXFUSE_ROOT = /usr/local CFLAGS_EXTRA = -DFUSE_USE_VERSION=26 -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-function -g ifeq ($(shell uname -s),Linux) - CFLAGS ::= $(CFLAGS_EXTRA) $(CFLAGS) + CFLAGS += $(CFLAGS_EXTRA) LIBS = -lfuse endif ifeq ($(shell uname -s),Darwin) From f3707d707fd35688487d84c3f6e74ed399f3649e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8E=B7=F0=9F=90=9B=20Lee=20Ball?= Date: Thu, 31 Dec 2020 20:04:13 -0800 Subject: [PATCH 3/4] Remove extra CFLAGS_EXTRA --- fs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/Makefile b/fs/Makefile index 6d0b22d..7af13cd 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -11,7 +11,7 @@ ifeq ($(shell uname -s),Linux) LIBS = -lfuse endif ifeq ($(shell uname -s),Darwin) - CFLAGS = -I$(OSXFUSE_ROOT)/include/osxfuse/fuse -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS_EXTRA) $(CFLAGS) + CFLAGS = -I$(OSXFUSE_ROOT)/include/osxfuse/fuse -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS) LIBS = -losxfuse endif From 0bef10a59fb8bf63faa4244d490d89118554fff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8E=B7=F0=9F=90=9B=20Lee=20Ball?= Date: Thu, 31 Dec 2020 20:06:48 -0800 Subject: [PATCH 4/4] Brain no good, made additional fix. --- fs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/Makefile b/fs/Makefile index 7af13cd..e5a4b18 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -11,7 +11,7 @@ ifeq ($(shell uname -s),Linux) LIBS = -lfuse endif ifeq ($(shell uname -s),Darwin) - CFLAGS = -I$(OSXFUSE_ROOT)/include/osxfuse/fuse -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS) + CFLAGS = -I$(OSXFUSE_ROOT)/include/osxfuse/fuse -L$(OSXFUSE_ROOT)/lib -D_DARWIN_USE_64_BIT_INODE $(CFLAGS_EXTRA) LIBS = -losxfuse endif