Skip to content

[cxxmodules] Move the set of sharedLibraryPathName before its first use. #1366

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

Merged
vgvassilev merged 1 commit into from
Nov 25, 2017
Merged

[cxxmodules] Move the set of sharedLibraryPathName before its first use. #1366

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
9 changes: 5 additions & 4 deletions core/dictgen/src/rootcling_impl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4264,6 +4264,11 @@ int RootClingMain(int argc,
// and we actually do lex with __CINT__ and reuse this variable later,
// we have to copy it now.
auto clingArgsInterpreter = clingArgs;

if (sharedLibraryPathName.empty()) {
sharedLibraryPathName = dictpathname;
}

if (!isPCH && getenv("ROOT_MODULES")) {
// We just pass -fmodules, the CIFactory will do the rest and configure
// clang correctly once it sees this flag.
Expand Down Expand Up @@ -4490,10 +4495,6 @@ int RootClingMain(int argc,
return 1;
}

if (sharedLibraryPathName.empty()) {
sharedLibraryPathName = dictpathname;
}

// We have a multiDict request. This implies generating a pcm which is of the form
// dictName_libname_rdict.pcm
if (multiDict) {
Expand Down