diff options
Diffstat (limited to 'clang/lib/Driver')
-rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 4 | ||||
-rw-r--r-- | clang/lib/Driver/Tools.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index e526cc8f994..d296980ce7b 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -4598,12 +4598,12 @@ PS4CPU::PS4CPU(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) if (Args.hasArg(options::OPT_static)) D.Diag(diag::err_drv_unsupported_opt_for_target) << "-static" << "PS4"; - // Determine where to find the PS4 libraries. We use SCE_PS4_SDK_DIR + // Determine where to find the PS4 libraries. We use SCE_ORBIS_SDK_DIR // if it exists; otherwise use the driver's installation path, which // should be <SDK_DIR>/host_tools/bin. SmallString<512> PS4SDKDir; - if (const char *EnvValue = getenv("SCE_PS4_SDK_DIR")) { + if (const char *EnvValue = getenv("SCE_ORBIS_SDK_DIR")) { if (!llvm::sys::fs::exists(EnvValue)) getDriver().Diag(clang::diag::warn_drv_ps4_sdk_dir) << EnvValue; PS4SDKDir = EnvValue; diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index c408e6c79e0..b6d86e4ea8e 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -10694,7 +10694,7 @@ void PS4cpu::Assemble::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Input.getFilename()); const char *Exec = - Args.MakeArgString(getToolChain().GetProgramPath("ps4-as")); + Args.MakeArgString(getToolChain().GetProgramPath("orbis-as")); C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs)); } @@ -10762,7 +10762,7 @@ static void ConstructPS4LinkJob(const Tool &T, Compilation &C, CmdArgs.push_back("-lpthread"); } - const char *Exec = Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld")); + const char *Exec = Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld")); C.addCommand(llvm::make_unique<Command>(JA, T, Exec, CmdArgs, Inputs)); } @@ -10935,9 +10935,9 @@ static void ConstructGoldLinkJob(const Tool &T, Compilation &C, const char *Exec = #ifdef LLVM_ON_WIN32 - Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld.gold")); + Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld.gold")); #else - Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld")); + Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld")); #endif C.addCommand(llvm::make_unique<Command>(JA, T, Exec, CmdArgs, Inputs)); |