From b70a222242d045fc37866e10a59db28152b8c42a Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Fri, 1 Dec 2017 11:43:16 +0100 Subject: [PATCH 1/2] Add cwd to prebuilt module path. This will be able to find modules generated by rootcling outside of the standard ROOT build. This is often the case when we have custom dictionaries. --- core/metacling/src/TCling.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx index e2bd145cf6b23..dff3c0d7db2e4 100644 --- a/core/metacling/src/TCling.cxx +++ b/core/metacling/src/TCling.cxx @@ -1253,6 +1253,8 @@ TCling::TCling(const char *name, const char *title) fMetaProcessor = new cling::MetaProcessor(*fInterpreter, fMPOuts); if (fInterpreter->getCI()->getLangOpts().Modules) { + fInterpreter->getCI()->getHeaderSearchOpts().AddPrebuiltModulePath("."); + // Setup core C++ modules if we have any to setup. // Load libc and stl first. From 819fbad6ddc1f450ba45e80a32480c48776df848 Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Sun, 11 Mar 2018 23:59:18 +0100 Subject: [PATCH 2/2] Test if the runtime_cxxmodules infrastructure is still sane. --- core/metacling/src/TCling.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx index dff3c0d7db2e4..fb65ccfc614f1 100644 --- a/core/metacling/src/TCling.cxx +++ b/core/metacling/src/TCling.cxx @@ -1253,7 +1253,7 @@ TCling::TCling(const char *name, const char *title) fMetaProcessor = new cling::MetaProcessor(*fInterpreter, fMPOuts); if (fInterpreter->getCI()->getLangOpts().Modules) { - fInterpreter->getCI()->getHeaderSearchOpts().AddPrebuiltModulePath("."); + //fInterpreter->getCI()->getHeaderSearchOpts().AddPrebuiltModulePath("."); // Setup core C++ modules if we have any to setup.