build: Set flags for building C code, and add AR/RANLIB variables.

diff --git a/Makefile.head b/Makefile.head
index c550d0c9f49ff9db3bb4d0d23b93307882923cdf..da2bc1da75a78090603ee4348d735b330039e151 100644 (file)
--- a/Makefile.head
+++ b/Makefile.head
@@ -43,6 +43,9 @@ CXXINCS += -I$(TOP)/include/c++ -I$(GENINCLUDES)/c++ \
            -I$(TOP)/include/c -I$(TOP)/include/c/std \
            -I$(BUILDDIR)/include
 
+CINCS += -I$(TOP)/include/c -I$(TOP)/include/c/std \
+         -I$(BUILDDIR)/include
+
 WARN += -Wall -Werror
 OPT += -O2
 DEBUG += -g3
@@ -51,6 +54,9 @@ ABI += -freg-struct-return
 CXXFLAGS += $(CXXINCS) $(DEFS) $(CXXWARN) $(OPT) $(DEBUG) $(ABI)
 BUILDCXXFLAGS += $(BUILDDEFS) $(CXXWARN) $(OPT) $(DEBUG)
 
+CFLAGS += $(CINCS) $(DEFS) $(CWARN) $(OPT) $(DEBUG) $(ABI)
+BUILDCFLAGS += $(BUILDDEFS) $(CWARN) $(OPT) $(DEBUG)
+
 .PHONY: all default rerun dep servers clean distclean
 .SUFFIXES:
 

diff --git a/Makefile.target b/Makefile.target
index 32102e48e81398b96eb9557a6e0d4dd34fd2e224..7167a5431c51484ec40b655af9dddae3335a920a 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -79,11 +79,13 @@ BUILDCXX := g++
 CC := $(CROSS)g++
 CXX := $(CROSS)g++
 AS := $(CROSS)as
+AR := $(CROSS)ar
 LD := $(CROSS)ld
 STRIP := $(CROSS)strip
 DEFS += -D_LL_ARCH_$(ARCH) -D_LL_ARCH=$(ARCH)
 MKDIR := mkdir -p
 MV := mv
+RANLIB := $(CROSS)ranlib
 RM := rm -f
 RMDIR := rm -rf
 LN := ln -s