Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Commit

Permalink
Update environment to run in SL6
Browse files Browse the repository at this point in the history
  • Loading branch information
andrey-popov committed Sep 27, 2014
1 parent 03f6c41 commit 2f8be37
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ endif
ifeq ($(shell hostname | grep -q lxplus; echo $$?), 0)
ifeq ($(BOOST_ROOT), )
# Set the path to Boost appropriate for lxplus
BOOST_ROOT = /afs/cern.ch/sw/lcg/external/Boost/1.50.0_python2.7/x86_64-slc5-gcc46-opt
BOOST_ROOT = /afs/cern.ch/sw/lcg/external/Boost/1.55.0_python2.7/x86_64-slc6-gcc47-opt
endif

BOOST_INCLUDE = $(BOOST_ROOT)/include/boost-1_50
BOOST_LIB_POSTFIX = -gcc46-mt-1_50
BOOST_INCLUDE = $(BOOST_ROOT)/include/boost-1_55
BOOST_LIB_POSTFIX = -gcc47-mt-1_55
else
ifeq ($(BOOST_ROOT), )
$(error Mandatory environment variable BOOST_ROOT is not set)
Expand All @@ -30,7 +30,7 @@ BOOST_LIB = $(BOOST_ROOT)/lib
CC = g++
INCLUDE = -Icore/include -Iextensions/include -I$(shell root-config --incdir) -I$(BOOST_INCLUDE)
OPFLAGS = -O2
CFLAGS = -Wall -Wextra -fPIC -std=c++11 $(INCLUDE) $(OPFLAGS)
CFLAGS = -Wall -Wextra -Wno-unused-local-typedefs -fPIC -std=c++11 $(INCLUDE) $(OPFLAGS)
#LDFLAGS = $(shell root-config --libs) -lTreePlayer -lHistPainter \
# -L$(BOOST_LIB) -lboost_filesystem$(BOOST_LIB_POSTFIX) $(PEC_FWK_INSTALL)/lib/libpecfwk.a \
# -Wl,-rpath=$(BOOST_LIB)
Expand Down
8 changes: 4 additions & 4 deletions env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ function set_environment
{
case $1 in
"-r")
gcc_version="4.7.2"
source /afs/cern.ch/sw/lcg/external/gcc/$gcc_version/x86_64-slc5/setup.sh ""
root_version="5.34.09"
source /afs/cern.ch/sw/lcg/app/releases/ROOT/$root_version/x86_64-slc5-gcc46-opt/root/bin/thisroot.sh
gcc_version="4.9.1"
source /afs/cern.ch/sw/lcg/external/gcc/$gcc_version/x86_64-slc6/setup.sh ""
root_version="5.34.20"
source /afs/cern.ch/sw/lcg/app/releases/ROOT/$root_version/x86_64-slc6-gcc48-opt/root/bin/thisroot.sh
#echo "GCC $gcc_version and ROOT $root_version are configured"
;;

Expand Down

0 comments on commit 2f8be37

Please sign in to comment.