"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "core/base/src/TSystem.cxx" between
root_v6.26.08.source.tar.gz and root_v6.26.10.source.tar.gz

About: The ROOT system is an object-oriented framework for large scale scientific data analysis and data mining. Latest pro(duction) version.

TSystem.cxx  (root_v6.26.08.source)	:	TSystem.cxx  (root_v6.26.10.source)
skipping to change at line 3756		skipping to change at line 3756
else		else
testcmd.ReplaceAll("$Opt",fFlagsOpt);		testcmd.ReplaceAll("$Opt",fFlagsOpt);
#ifdef WIN32		#ifdef WIN32
R__FixLink(testcmd);		R__FixLink(testcmd);
testcmd.ReplaceAll("-std=", "-std:");		testcmd.ReplaceAll("-std=", "-std:");
#endif		#endif
// ======= Build the library		// ======= Build the library
if (result) {		if (result) {
if (verboseLevel>3 && withInfo) {		TString cmdAllowUnresolved = cmd;
		#ifdef R__MACOSX
		// Allow linking to succeed despite the missing symbols.
		cmdAllowUnresolved.ReplaceAll("-dynamiclib", "-dynamiclib -Wl,-flat_namesp
		ace -Wl,-undefined,suppress");
		#endif
		if (verboseLevel > 3 && withInfo) {
::Info("ACLiC","compiling the dictionary and script files");		::Info("ACLiC","compiling the dictionary and script files");
if (verboseLevel>4) ::Info("ACLiC", "%s", cmd.Data());		if (verboseLevel>4)
		::Info("ACLiC", "%s", cmdAllowUnresolved.Data());
}		}
Int_t success = ExecAndReport(cmd);		Int_t success = ExecAndReport(cmdAllowUnresolved);
if (!success) {		if (!success) {
if (produceRootmap) {		if (produceRootmap) {
gSystem->Unlink(libmapfilename);		gSystem->Unlink(libmapfilename);
}		}
}		}
result = success;		result = success;
}		}
if ( result ) {		if ( result ) {
if (linkDepLibraries) {		if (linkDepLibraries) {
skipping to change at line 3789		skipping to change at line 3795
::Error("TSystem::CompileMacro", "Cannot find library '%s'", dep) ;		::Error("TSystem::CompileMacro", "Cannot find library '%s'", dep) ;
return false; // abort		return false; // abort
}		}
depLibsFullPaths += " " + LibFullPath;		depLibsFullPaths += " " + LibFullPath;
return true;		return true;
};		};
ForeachSharedLibDep(library, CollectF);		ForeachSharedLibDep(library, CollectF);
TString relink_cmd = cmd.Strip(TString::kTrailing, ';');		TString relink_cmd = cmd.Strip(TString::kTrailing, ';');
relink_cmd += depLibsFullPaths;		relink_cmd += depLibsFullPaths;
		if (verboseLevel > 3 && withInfo) {
		::Info("ACLiC", "relinking against all dependencies");
		if (verboseLevel > 4)
		::Info("ACLiC", "%s", relink_cmd.Data());
		}
result = ExecAndReport(relink_cmd);		result = ExecAndReport(relink_cmd);
}		}
TNamed *k = new TNamed(library,library);		TNamed *k = new TNamed(library,library);
Long_t lib_time;		Long_t lib_time;
gSystem->GetPathInfo( library, nullptr, (Long_t*)nullptr, nullptr, &lib_ti me );		gSystem->GetPathInfo( library, nullptr, (Long_t*)nullptr, nullptr, &lib_ti me );
k->SetUniqueID(lib_time);		k->SetUniqueID(lib_time);
if (!keep) k->SetBit(kMustCleanup);		if (!keep) k->SetBit(kMustCleanup);
fCompiled->Add(k);		fCompiled->Add(k);
End of changes. 4 change blocks.
3 lines changed or deleted		15 lines changed or added

---