Fix an issue running intel-classic on x64 mac

chalet-org · Dec 24, 2023 · ff28a95 · ff28a95
1 parent 8d16b96
commit ff28a95
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/Compile/CompilerCxx/CompilerCxxEmscripten.hpp b/src/Compile/CompilerCxx/CompilerCxxEmscripten.hpp
@@ -19,8 +19,5 @@ struct CompilerCxxEmscripten : public CompilerCxxClang
 	virtual bool addExecutable(StringList& outArgList) const final;
 
 	virtual void addPositionIndependentCodeOption(StringList& outArgList) const final;
-
-private:
-	// std::string m_pchSource;
 };
 }
diff --git a/src/Compile/CompilerCxx/CompilerCxxIntelClang.hpp b/src/Compile/CompilerCxx/CompilerCxxIntelClang.hpp
@@ -14,8 +14,5 @@ struct CompilerCxxIntelClang : public CompilerCxxClang
 	explicit CompilerCxxIntelClang(const BuildState& inState, const SourceTarget& inProject);
 
 	virtual bool initialize() final;
-
-private:
-	// std::string m_pchSource;
 };
 }
diff --git a/src/Compile/CompilerCxx/CompilerCxxIntelClassicGCC.cpp b/src/Compile/CompilerCxx/CompilerCxxIntelClassicGCC.cpp
@@ -41,14 +41,12 @@ bool CompilerCxxIntelClassicGCC::initialize()
 
 		if (buildHashChanged)
 		{
-			// If The previous build with this build path (matching target triples) has an intermediate PCH file, remove it
-			auto oldPch = fmt::format("{}/{}", m_state.paths.objDir(), pch);
-			Files::removeIfExists(oldPch);
+			Files::removeIfExists(m_pchSource);
 		}
 
 		if (!Files::pathExists(m_pchSource))
 		{
-			auto pchMinusLocation = String::getPathFilename(pch);
+			auto pchMinusLocation = Files::getCanonicalPath(pch);
 			if (!Files::createFileWithContents(m_pchSource, fmt::format("// Generated by Chalet\n\n#include \"{}\"", pchMinusLocation)))
 				return false;
 		}