Skip to content

Commit

Permalink
Kill PCH some more.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andersbakken committed Sep 20, 2012
1 parent 282f23a commit 0fc9a6e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
26 changes: 0 additions & 26 deletions src/GccArguments.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ void GccArguments::clear()
mClangArgs.clear();
mInputFiles.clear();
mUnresolvedInputFiles.clear();
mIncludes.clear();
mOutputFile.clear();
mBase.clear();
mCompiler.clear();
Expand Down Expand Up @@ -182,20 +181,6 @@ bool GccArguments::parse(ByteArray args, const Path &base)
mClangArgs.append("-x");
mClangArgs.append(cur);
break;
case 'i': {
Path inc = Path::resolved(cur + ByteArray(".gch"), path, &pathok);
if (!pathok) // try without .gch postfix
inc = Path::resolved(cur, path, &pathok);
if (pathok) {
mIncludes.append(inc);
} else {
if (!inc.isAbsolute()) {
mIncludes.append(Path(path + "/" + cur + ByteArray(".gch"))); // ### is assuming .gch correct here?
} else {
warning("-include %s could not be resolved", cur);
}
} }
break;
case 'o': {
if (!mOutputFile.isEmpty())
warning("Already have an output file: %s (new %s)",
Expand All @@ -215,8 +200,6 @@ bool GccArguments::parse(ByteArray args, const Path &base)
prevopt = 'x';
else if (!strcmp(cur, "-o"))
prevopt = 'o';
else if (!strcmp(cur, "-include"))
prevopt = 'i';
else
prevopt = '\1';
continue;
Expand Down Expand Up @@ -305,15 +288,6 @@ List<Path> GccArguments::unresolvedInputFiles() const
return mUnresolvedInputFiles;
}

List<ByteArray> GccArguments::explicitIncludes() const
{
List<ByteArray> incs;
const int c = mIncludes.size();
for (int i=0; i<c; ++i)
incs.append(mIncludes.at(i));
return incs;
}

Path GccArguments::outputFile() const
{
return mOutputFile;
Expand Down
3 changes: 1 addition & 2 deletions src/GccArguments.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ class GccArguments
List<ByteArray> clangArgs() const;
List<Path> inputFiles() const;
List<Path> unresolvedInputFiles() const;
List<ByteArray> explicitIncludes() const;
Path outputFile() const;
Path baseDirectory() const;
Path compiler() const;
private:
List<ByteArray> mClangArgs;
List<Path> mInputFiles, mUnresolvedInputFiles, mIncludes;
List<Path> mInputFiles, mUnresolvedInputFiles;
Path mOutputFile, mBase, mCompiler;
GccArguments::Type mType;
GccArguments::Lang mLang;
Expand Down

0 comments on commit 0fc9a6e

Please sign in to comment.