Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce the needed memory for compilation #1516

Closed
wants to merge 1 commit into from
Closed

Reduce the needed memory for compilation #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/metacling/Module.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ endif
CLINGLIB := $(LPATH)/libCling.$(SOEXT)
CLINGMAP := $(CLINGLIB:.$(SOEXT)=.rootmap)

$(CLINGLIB): $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO)
# The dependency on $(ROOTCLING1EXE) was added to prevent $(CLINGLIB) and
# $(ROOTCLING1EXE) from being linked in parallel.
# This avoids doing two memory consuming operations in parallel.
$(CLINGLIB): $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \
$(ROOTCLING1EXE)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS) $(LIBCLINGLDFLAGS)" \
"$(SOFLAGS)" libCling.$(SOEXT) $@ \
"$(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \
Expand Down
4 changes: 4 additions & 0 deletions core/metacling/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ ROOT_LINKER_LIBRARY(Cling
$<TARGET_OBJECTS:Dictgen>
$<TARGET_OBJECTS:MetaCling>
LIBRARIES ${CLING_LIBRARIES})
# The dependency on rootcling_stage1 was added to prevent Cling (libCling) and
# rootcling_stage1 from being linked in parallel.
# This avoids doing two memory consuming operations in parallel.
add_dependencies(Cling rootcling_stage1)

if(MSVC)
set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
Expand Down