Skip to content

Commit 5054761

Browse files
David SalinasDavid Salinas
authored andcommitted
HIPCC remove isystem options from nvcc invocations
SWDEV-488548 - HIP GitHub#2712: hipcc fails when cuda is installed in /usr Change-Id: Ife5255f89a8d61a1afea0e1c562e9abc6081352a
1 parent 003c324 commit 5054761

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

amd/hipcc/bin/hipcc.pl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ sub get_normalized_path {
186186

187187
$HIPCC=get_normalized_path("$CUDA_PATH/bin/nvcc");
188188
$HIPCXXFLAGS .= " -Wno-deprecated-gpu-targets ";
189-
$HIPCXXFLAGS .= " -isystem " . get_normalized_path("$CUDA_PATH/include");
190-
$HIPCXXFLAGS .= " -isystem " . get_normalized_path("$HIP_PATH/include");
191-
$HIPCFLAGS .= " -isystem " . get_normalized_path("$CUDA_PATH/include");
192189

193190
$HIPLDFLAGS = " -Wno-deprecated-gpu-targets -lcuda -lcudart -L" . get_normalized_path("$CUDA_PATH/lib64");
194191
} else {

amd/hipcc/src/hipBin_nvidia.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -203,16 +203,6 @@ const string& HipBinNvidia::getHipLdFlags() const {
203203

204204
// initialize Hipc flags
205205
void HipBinNvidia::initializeHipCFlags() {
206-
string hipCFlags;
207-
const string& cudaPath = getCompilerPath();
208-
if (getOSInfo() == windows)
209-
hipCFlags += " -isystem \"" + cudaPath + "/include\"";
210-
else
211-
hipCFlags += " -isystem " + cudaPath + "/include";
212-
string hipIncludePath;
213-
hipIncludePath = getHipInclude();
214-
hipCFlags += " -isystem \"" + hipIncludePath + "\"";
215-
hipCFlags_ = hipCFlags;
216206
}
217207

218208
// returns Hipccx flags
@@ -223,14 +213,6 @@ const string& HipBinNvidia::getHipCXXFlags() const {
223213
// initializes the HIPCCX flags
224214
void HipBinNvidia::initializeHipCXXFlags() {
225215
string hipCXXFlags = " -Wno-deprecated-gpu-targets ";
226-
const string& cudaPath = getCompilerPath();
227-
if (getOSInfo() == windows)
228-
hipCXXFlags += " -isystem \"" + cudaPath + "/include\"";
229-
else
230-
hipCXXFlags += " -isystem " + cudaPath + "/include";
231-
string hipIncludePath;
232-
hipIncludePath = getHipInclude();
233-
hipCXXFlags += " -isystem \"" + hipIncludePath + "\"";
234216
hipCXXFlags_ = hipCXXFlags;
235217
}
236218

0 commit comments

Comments
 (0)