github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-24 14:22:13 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Fixed crashing in GCC builder

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9868 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-05-22 12:21:01 +00:00
parent 634aaa21f1
commit 5fce403bfa
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/ide/Builders/GccBuilder.icpp
View file

@ -52,7 +52,6 @@ bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
Vector<String> sfile, isfile;
Vector<String> soptions, isoptions;
Vector<bool> optimize, ioptimize;
bool error = false;
String pch_header;
@ -161,8 +160,7 @@ bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
for(i = 0; i < sfile.GetCount(); i++) {
String fn = sfile[i];
String ext = ToLower(GetFileExt(fn));
if(findarg(ext, ".rc", ".brc", ".c") < 0 && HdependFileTime(sfile[i]) > GetFileTime(CatAnyPath(outdir, GetFileTitle(fn) + ".o"))
&& !optimize[i])
if(findarg(ext, ".rc", ".brc", ".c") < 0 && HdependFileTime(sfile[i]) > GetFileTime(CatAnyPath(outdir, GetFileTitle(fn) + ".o")))
recompile++;
}
@ -199,7 +197,6 @@ bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
int first_ifile = sfile.GetCount();
sfile.AppendPick(pick(isfile));
soptions.AppendPick(pick(isoptions));
optimize.AppendPick(pick(ioptimize));
int ccount = 0;
for(i = 0; i < sfile.GetCount(); i++) {
@ -249,8 +246,7 @@ bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
exec << fuse_cxa_atexit << " -x objective-c++ ";
else {
exec << fuse_cxa_atexit << Join(" -x c++", cpp_options) << ' ';
if(!optimize[i]) // GCC does not like different options for PCH
exec << pch_use;
exec << pch_use;
}
exec << GetHostPathQ(fn) << " " << soptions[i] << " -o " << GetHostPathQ(objfile);
PutVerbose(exec);