From 234303826faa378e5d82723f17d8e23bb8b3e7ed Mon Sep 17 00:00:00 2001 From: Philippe Canal <pcanal@fnal.gov> Date: Thu, 17 Nov 2011 15:13:13 +0000 Subject: [PATCH] repair enable-cling libCore linking git-svn-id: http://root.cern.ch/svn/root/trunk@42086 27541ba8-7e3a-0410-8455-c3a389f83636 --- Makefile | 2 +- core/metautils/Module.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c3fd86277bd..3ab430f069f 100644 --- a/Makefile +++ b/Makefile @@ -511,7 +511,7 @@ endif COREL = $(BASEL1) $(BASEL2) $(BASEL3) $(CONTL) $(METAL) $(ZIPL) \ $(SYSTEML) $(CLIBL) $(METAUTILSL) $(TEXTINPUTL) COREO = $(BASEO) $(CONTO) $(METAO) $(SYSTEMO) $(ZIPO) $(LZMAO) \ - $(CLIBO) $(METAUTILSO) $(TEXTINPUTO) + $(CLIBO) $(METAUTILSO) $(METAUTILSTO) $(TEXTINPUTO) COREDO = $(BASEDO) $(CONTDO) $(METADO) $(METACDO) $(SYSTEMDO) $(ZIPDO) \ $(CLIBDO) $(METAUTILSDO) $(TEXTINPUTDO) diff --git a/core/metautils/Module.mk b/core/metautils/Module.mk index d04bf292d4d..5e2cdb497cf 100644 --- a/core/metautils/Module.mk +++ b/core/metautils/Module.mk @@ -23,7 +23,7 @@ METAUTILSTH += $(MODDIRI)/TMetaUtils.h METAUTILSTS += $(MODDIRS)/TMetaUtils.cxx METAUTILSCXXFLAGS = $(filter-out -fno-exceptions,$(filter-out -fno-rtti,$(CLINGCXXFLAGS))) ifneq ($(CXX:g++=),$(CXX)) -METAUTILSTCXXFLAGS += -Wno-shadow -Wno-unused-parameter +METAUTILSCXXFLAGS += -Wno-shadow -Wno-unused-parameter endif endif @@ -67,4 +67,4 @@ distclean-$(MODNAME): clean-$(MODNAME) distclean:: distclean-$(MODNAME) ##### extra rules ###### -$(METAUTILSO): CXXFLAGS += $(METAUTILSCXXFLAGS) +$(METAUTILSTO): CXXFLAGS += $(METAUTILSCXXFLAGS) -- GitLab