From 358e9262b59d2b60c0d2559a78e6ef7ef285c24c Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Tue, 26 Feb 2013 14:43:52 +0000
Subject: [PATCH] Stop using modules for now, use one massive PCH called
etc/cling/ROOT.pch. This will be superseded by modules once merging works.
git-svn-id: http://root.cern.ch/svn/root/trunk@48717 27541ba8-7e3a-0410-8455-c3a389f83636
---
build/unix/makeonepcm.sh | 2 ++
core/meta/src/TCling.cxx | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build/unix/makeonepcm.sh b/build/unix/makeonepcm.sh
index cdb4d2cdada..9125efdf84a 100755
--- a/build/unix/makeonepcm.sh
+++ b/build/unix/makeonepcm.sh
@@ -197,6 +197,8 @@ mv alldefs.h include/allLinkDef.h
rm -f allDict.* lib/allDict_rdict.pcm
core/utils/src/rootcling_tmp -1 -f allDict.cxx -c $cxxflags -I$srcdir allHeaders.h include/allLinkDef.h
+mv lib/allDict.pch etc/cling/
+
# actually we won't need the allDict.[h,cxx] files
rm -f allDict.*
diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx
index fbd31cf3707..dbc9967f762 100644
--- a/core/meta/src/TCling.cxx
+++ b/core/meta/src/TCling.cxx
@@ -666,8 +666,10 @@ TCling::TCling(const char *name, const char *title)
fTemporaries = new std::vector<cling::StoredValueRef>();
std::string interpInclude = ROOT::TMetaUtils::GetInterpreterExtraIncludePath(false);
+ std::string pchFilename = interpInclude.substr(2) + "/cling/ROOT.pch";
const char* interpArgs[]
- = {"cling4root", interpInclude.c_str(), "-Xclang", "-fmodules"};
+ = {"cling4root", interpInclude.c_str(), "-include-pch", pchFilename.c_str()};
+ //"-Xclang", "-fmodules"};
fInterpreter = new cling::Interpreter(sizeof(interpArgs) / sizeof(char*),
interpArgs,
--
GitLab