diff --git a/ef/config/FreeBSD.mk b/ef/config/FreeBSD.mk index 74200241e442..2f8462d1d3dc 100644 --- a/ef/config/FreeBSD.mk +++ b/ef/config/FreeBSD.mk @@ -20,6 +20,13 @@ include $(DEPTH)/config/UNIX.mk +ifeq (86,$(findstring 86,$(OS_TEST))) +CPU_ARCH := x86 +else +CPU_ARCH := $(OS_TEST) +endif +CPU_ARCH_TAG = _$(CPU_ARCH) + DEFAULT_COMPILER = gcc CC = gcc CXX = g++ @@ -32,8 +39,10 @@ WARNING_CFLAG = -Wall # used by mkdepend X11INCLUDES = -I/usr/X11R6/include -INCLUDES += -I$(subst libgcc.a,include, \ +SYS_INCLUDES = -I$(subst libgcc.a,include, \ $(shell $(CC) -print-libgcc-file-name)) +SYS_INCLUDES += -I$(subst libgcc.a,include, \ + $(shell $(CCC) -print-libgcc-file-name)) ifeq ($(CPU_ARCH),x86) DEPENDFLAGS += -D__i386__ diff --git a/ef/config/Linux.mk b/ef/config/Linux.mk index 3efa1430f5b3..ceb78aa4c588 100644 --- a/ef/config/Linux.mk +++ b/ef/config/Linux.mk @@ -43,8 +43,10 @@ WARNING_CFLAG = -Wall # used by mkdepend X11INCLUDES = -I/usr/X11R6/include -INCLUDES += -I$(subst libgcc.a,include, \ +SYS_INCLUDES = -I$(subst libgcc.a,include, \ $(shell $(CC) -print-libgcc-file-name)) +SYS_INCLUDES += -I$(subst libgcc.a,include, \ + $(shell $(CCC) -print-libgcc-file-name)) ifeq ($(CPU_ARCH),x86) DEPENDFLAGS += -D__i386__ endif diff --git a/ef/config/corerules.mk b/ef/config/corerules.mk index b5d586b82bdc..89a3f6096aad 100644 --- a/ef/config/corerules.mk +++ b/ef/config/corerules.mk @@ -667,7 +667,7 @@ $(MKDEPENDENCIES): $(CSRCS) $(CPPSRCS) $(ASFILES) Makefile \ $(EXPORTS) $(LOCAL_EXPORTS) @$(MAKE_OBJDIR) touch $(MKDEPENDENCIES) - $(MKDEPEND) -p$(OBJDIR_NAME)/ -o'$(OBJ_SUFFIX)' -f$(MKDEPENDENCIES) $(INCLUDES) $(CSRCS) $(CPPSRCS) $(ASFILES) + $(MKDEPEND) -p$(OBJDIR_NAME)/ -o'$(OBJ_SUFFIX)' -f$(MKDEPENDENCIES) $(INCLUDES) $(SYS_INCLUDES) $(CSRCS) $(CPPSRCS) $(ASFILES) $(MKDEPEND): cd $(MKDEPEND_DIR); $(MAKE)