From ae137130295c229217505000840f201b5579cc19 Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <vvasilev@cern.ch>
Date: Thu, 15 Sep 2016 10:33:18 +0200
Subject: [PATCH] Remove FIXME, update comment.
---
CMakeLists.txt | 7 +++++--
Makefile | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e8f903c60a..f0a789677ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,8 +150,11 @@ get_property(__clingetcpch GLOBAL PROPERTY CLINGETCPCH)
string(REGEX REPLACE "[ ]-" ";-" CMAKE_CXX_FLAGS_SEPARATE ${CMAKE_CXX_FLAGS})
if(cxxmodules)
- # rootcling doesn't know what to do with these flags.
- # FIXME: Disable until until somebody teaches it.
+ # rootcling uses our internal version of clang. Passing the modules flags here
+ # would allow rootcling to find module files built by the external compiler
+ # (eg. $CXX or $CC). This, in turn, would cause problems if we are using
+ # different clang version (even different commit revision) as the modules files
+ # are not guaranteed to be compatible among clang revisions.
string(REPLACE "${ROOT_CXXMODULES_FLAGS}" "" CMAKE_CXX_FLAGS_SEPARATE ${CMAKE_CXX_FLAGS_SEPARATE})
endif(cxxmodules)
add_custom_command(OUTPUT etc/dictpch/allLinkDefs.h
diff --git a/Makefile b/Makefile
index 29278e9d35e..592a2fb1e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1137,8 +1137,11 @@ changelog:
releasenotes:
@$(MAKERELNOTES)
ROOTCLING_CXXFLAGS := $(CXXFLAGS)
-# rootcling doesn't know what to do with these flags.
-# FIXME: Disable until until somebody teaches it.
+# rootcling uses our internal version of clang. Passing the modules flags here
+# would allow rootcling to find module files built by the external compiler
+# (eg. $CXX or $CC). This, in turn, would cause problems if we are using
+# different clang version (even different commit revision) as the modules files
+# are not guaranteed to be compatible among clang revisions.
ifeq ($(CXXMODULES),yes)
ROOTCLING_CXXFLAGS := $(filter-out $(ROOT_CXXMODULES_CXXFLAGS),$(CXXFLAGS))
endif
--
GitLab