diff -uNr root.ORIG/cint/cint/Module.mk root/cint/cint/Module.mk --- root.ORIG/cint/cint/Module.mk 2016-04-05 17:24:40.000000000 +0900 +++ root/cint/cint/Module.mk 2016-12-27 19:04:28.000000000 +0900 @@ -165,6 +165,10 @@ CINTS2 := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2)) CINTS2 += $(MODDIRSD)/gcc4strm.cxx endif +ifeq ($(GCC_MAJOR),6) +CINTS2 := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2)) +CINTS2 += $(MODDIRSD)/gcc4strm.cxx +endif ifneq ($(CLANG_MAJOR),) CINTS2 := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2)) CINTS2 += $(MODDIRSD)/gcc4strm.cxx @@ -207,6 +211,9 @@ ifneq ($(CLANG_MAJOR),) IOSENUMA := $(CINTDIRIOSEN)/iosenum.$(ARCH)3 else +ifeq ($(GCC_MAJOR),6) +IOSENUMA := $(CINTDIRIOSEN)/iosenum.$(ARCH)3 +else ifeq ($(GCC_MAJOR),5) IOSENUMA := $(CINTDIRIOSEN)/iosenum.$(ARCH)3 else @@ -221,6 +228,7 @@ endif endif endif +endif # used in the main Makefile ALLHDRS += $(CINTHT) $(CINTINCLUDES) @@ -355,6 +363,9 @@ ifeq ($(GCC_MAJOR),5) $(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing endif +ifeq ($(GCC_MAJOR),6) +$(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing +endif $(MAKECINTO) $(CINTO): $(CINTCONF) $(ORDER_) $(CINTINCLUDES) @@ -389,8 +400,12 @@ ##### configcint.h ifeq ($(CPPPREP),) # cannot use "CPPPREP?=", as someone might set "CPPPREP=" +ifeq ($(GCC_MAJOR),6) + CPPPREP = $(CXX) -std=c++98 -E -C +else CPPPREP = $(CXX) -E -C endif +endif include $(CINTCONFMK) ##### configcint.h - END