From e6e38b6ed3cab6617d4a497545815568f2e99086 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 17 May 2020 21:47:17 +0200
Subject: [PATCH] build: Combine CFLAGS and LIBCFLAGS.

We stopped compiling some object files twice some time ago. Since
then, all object files are build with the concatenation of both sets
of options.

The two variables are only used at this point, so it is safe to
combine them.
---
 Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 86cdc8f..92e66c1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,10 +42,8 @@ CFLAGS += -Werror-implicit-function-declaration
 CFLAGS += -Wmissing-format-attribute
 CFLAGS += -Wunused-macros
 CFLAGS += -Wbad-function-cast
-
-# cflags used only for building library objects
-LIBCFLAGS += -fPIC
-LIBCFLAGS += -fvisibility=hidden
+CFLAGS += -fPIC
+CFLAGS += -fvisibility=hidden
 
 libname := osl
 
@@ -78,7 +76,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
 endif
 %.o: %.c Makefile errtab.h
-	$(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $(LIBCFLAGS) $<
+	$(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $<
 
 fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
-- 
2.39.5