repair buildroot support

fdpp/clang.mak

@@ -2,22 +2,25 @@
 # CLANG.MAK - kernel copiler options for clang
 #
 
-LD ?= ld
 CROSS_LD ?= x86_64-linux-gnu-ld
 CCACHE ?= $(shell which ccache 2>/dev/null)
-CC = $(CCACHE) clang
+CC ?= $(CCACHE) clang
 CXX = $(CCACHE) clang++
-CLANG_VER := $(shell $(CC) -v 2>&1 | head -n 1 | \
+CLANG_VER := $(shell $(CXX) -v 2>&1 | head -n 1 | \
   sed -E 's/.+ version ([^.]+)\.[^.]+\.[^ ]+.*/\1/')
 FLEX = $(shell which flex 2>/dev/null)
 ifneq ($(FLEX),)
 LEX = $(FLEX)
 endif
 
-CC_FOR_BUILD = $(CCACHE) clang
+CC_FOR_BUILD ?= $(CC)
 CPP = $(CC_FOR_BUILD) -E
-CC_LD = $(CXX)
-CL = $(CC)
+ifeq ($(CXX_LD),)
+CXX_LD = $(CXX)
+endif
+ifeq ($(CC_LD),)
+CC_LD = $(CC)
+endif
 NASM ?= nasm-segelf
 PKG_CONFIG ?= pkg-config
 
@@ -60,7 +63,7 @@ endif
 
 CXXFLAGS = $(TARGETOPT) $(CPPFLAGS) $(WFLAGS) $(DBGFLAGS) $(TARGETOPT_XTRA)
 CFLAGS = -Wall $(DBGFLAGS)
-CLCFLAGS = -c -fpic $(WCFLAGS) $(DBGFLAGS) -xc++
+CLCFLAGS = -c -fpic -Wall $(DBGFLAGS) -xc++
 LDFLAGS = -shared -Wl,--build-id=sha1
 
 ifeq ($(XFAT),32)

fdpp/loader/makefile

@@ -34,7 +34,7 @@ ALL = $(T)/$(FDPPLIB)
 all: $(ALL)
 
 $(T)/$(FDPPLIB): $(OBJECTS)
-	$(CL) -o $@ $^ $(LDFLAGS) $(LIBS)
+	$(CC_LD) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 $(OBJECTS): %.o: $(srcdir)/%.c $(addprefix $(srcdir)/,$(HEADERS)) $(srcdir)/makefile
 	$(CC) $(CFLAGS) -c -o $@ $<

fdpp/makefile

@@ -127,24 +127,24 @@ FDPP_CCOBJS = $(FDPP_CCFILES:.cc=.o)
 FDPP_CPPOBJS = $(CPPFILES:.cpp=.o)
 
 $(OBJECTS): %.o: %.cc $(HEADERS) $(GEN_HEADERS_FD) $(EXT_H)
-	$(CC) $(CXXFLAGS) -o $@ $<
+	$(CXX) $(CXXFLAGS) -o $@ $<
 
 $(FDPP_COBJS): %.o: $(srcdir)/%.c $(PPHDRS) $(srcdir)/makefile
-	$(CC) $(CLCFLAGS) -I . -o $@ $<
+	$(CXX) $(CLCFLAGS) -I . -o $@ $<
 
 thunks.o: $(EXT_H) $(GIT_REV)
 thunks_a.o: $(SRC)/glob_asm.h $(srcdir)/glob_tmpl.h plt_asmc.h plt_asmp.h
 $(FDPP_CCOBJS): %.o: $(srcdir)/%.cc $(GEN_HEADERS) $(PPHDRS) $(srcdir)/makefile
-	$(CC) $(CXXFLAGS) -o $@ $<
+	$(CXX) $(CXXFLAGS) -o $@ $<
 
 $(FDPP_CPPOBJS): %.o: $(srcdir)/%.cpp $(PPHDRS) $(srcdir)/makefile
-	$(CC) $(CXXFLAGS) -o $@ $<
+	$(CXX) $(CXXFLAGS) -o $@ $<
 
 $(GEN_CC): %.cc: $(SRC)/%.c makefile
 	$(srcdir)/parsers/mkfar.sh $< >$@
 
 $(FDPPLIB): $(OBJECTS) $(FDPP_COBJS) $(FDPP_CCOBJS) $(FDPP_CPPOBJS)
-	$(CC_LD) -o $@ $^ $(LDFLAGS) $(LIBS)
+	$(CXX_LD) -o $@ $^ $(LDFLAGS) $(LIBS)
 	@echo "Have `nm -u $@ | grep "U " | wc -l` undefined symbols"
 
 $(FDPPDEVL): $(FDPPLIB)