Revision 93423011ebdb0cc0c2dbd4edffdc21e2923f590f authored by Olivier Couet on 23 June 2008, 15:36:54 UTC, committed by Olivier Couet on 23 June 2008, 15:36:54 UTC
"Make option BAR work with option HIST" This test worked nicely when Hoption.Bar >= 10 (option "BAR" and "HBAR"). But, in some cases, it disabled th case Hoption.Bar = 1 (simple option "B"). git-svn-id: http://root.cern.ch/svn/root/trunk@24484 27541ba8-7e3a-0410-8455-c3a389f83636
1 parent cf52f89
Makefile.macosxicc
# -*- mode: makefile -*-
#
# Makefile of ROOT for MacOS X, using Intel icc >= 9.1 compiler
PLATFORM = macosx
DEBUGFLAGS = -g
OPTFLAGS = -O
ifeq (debug,$(findstring debug,$(ROOTBUILD)))
OPT = $(DEBUGFLAGS)
NOOPT = -O0
else
OPT = $(OPTFLAGS)
NOOPT = -O0
endif
# Compiler:
CXX = icc
CC = icc
CXXFLAGS = -fPIC -wd1476 $(EXTRA_CXXFLAGS)
CFLAGS = -fPIC $(EXTRA_CFLAGS) -restrict
CINTCXXFLAGS = -fPIC $(EXTRA_CXXFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__ROOT -DG__REDIRECTIO -DG__OSFDLL \
-DG__STD_EXCEPTION
CINTCFLAGS = -fPIC $(EXTRA_CFLAGS) \
-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
-DG__ROOT -DG__REDIRECTIO -DG__OSFDLL \
-DG__STD_EXCEPTION
# Compiler version:
ICC_MAJOR := $(shell $(CXX) -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f1)
ICC_MINOR := $(shell $(CXX) -v 2>&1 | awk '{ if (NR==1) print $$2 }' | \
cut -d'.' -f2)
ifeq ($(ICC_MAJOR),8)
ifneq ($(ICC_MINOR),0)
CXXFLAGS += -wd1572
CFLAGS += -wd1572
CINTCXXFLAGS += -wd1572
CINTCFLAGS += -wd1572
USE_PCH = -use_pch
CREATE_PCH = -create_pch
endif
endif
ifeq ($(ICC_MAJOR),9)
CXXFLAGS += -wd1572 -wd873 -wd672
CFLAGS += -wd1572
CINTCXXFLAGS += -wd1572 -wd873
CINTCFLAGS += -wd1572
USE_PCH = -use_pch
CREATE_PCH = -create_pch
ICC_GE_9 = 9
endif
ifeq ($(ICC_MAJOR),10)
CXXFLAGS += -wd1572 -wd873 -wd672
CFLAGS += -wd1572
CINTCXXFLAGS += -wd1572 -wd873
CINTCFLAGS += -wd1572
USE_PCH = -pch-use
CREATE_PCH = -pch-create
ICC_GE_9 = 10
ifneq ($(ICC_MINOR),0)
ICC_GE_101 = 101
endif
endif
# OS version
MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)
MACOSX_CPU := $(shell uname -p)
FINK_DIR := $(shell which fink 2>&1 | sed -ne "s/\/bin\/fink//p")
# Linker:
LD = icpc
LDFLAGS = $(OPT) $(EXTRA_LDFLAGS)
FORCELINK = no
MACOSXTARGET := MACOSX_DEPLOYMENT_TARGET=10.$(MACOSX_MINOR)
ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
ifeq ($(USECONFIG),FALSE)
SOFLAGS = $(OPT) -dynamiclib -single_module \
-undefined dynamic_lookup -install_name @rpath/
else
SOFLAGS = $(OPT) -dynamiclib -single_module \
-undefined dynamic_lookup -install_name $(LIBDIR)/
endif
else
ifeq ($(subst $(MACOSX_MINOR),,123),123)
SOFLAGS = $(OPT) -dynamiclib -single_module \
-undefined dynamic_lookup -install_name $(LIBDIR)/
endif
endif
#ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
# not yet supported by icc 10.1 xilibtool
#SOEXT = so
#else
SOEXT = dylib
#endif
# System libraries:
SYSLIBS = -lm $(EXTRA_LDFLAGS) $(OSTHREADLIBDIR) \
$(OSTHREADLIB) -ldl
XLIBS = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11
CILIBS = -lm $(EXTRA_LDFLAGS) -ldl
# Fortran:
F77 =
ifeq ($(shell which ifort 2>&1 | sed -ne "s/.*\/ifort/ifort/p"),ifort)
F77 := ifort
F77FLAGS :=
F77LIBS := -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-lifcore
endif
ifneq ($(F77),)
F77LD := $(F77)
endif
# Precompiled headers:
PCHSUPPORTED := $(ENABLEPCH)
ifeq ($(PCHSUPPORTED),yes)
PCHFILE = include/precompile.pchi
PCHCXXFLAGS = -DUSEPCH -include precompile.h $(USE_PCH) $(PCHFILE)
PCHEXTRAOBJBUILD = $(LD) $(OPT) $(CXXFLAGS) -DUSEPCH \
-include precompile.h $(CREATE_PCH) $(PCHFILE) \
-c $(PCHEXTRASRC) -o $(PCHEXTRAOBJ)
endif
# Override default in Makefile.config
INSTALL := /bin/cp -pPR
INSTALLDATA := /bin/cp -pPR
# Extras
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...