From cf6ccf67dfac006ddf1d78eb722e8f9f056cfdc0 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Fri, 7 Apr 2017 14:51:54 +0530
Subject: [PATCH] Fix build issues in hipCommander sample

- Remove -stdlib=libstdc++ from Makefile
- Removed deleted HIP header file fom includes

Change-Id: Ia189396bee19fc52b679259df56c6c6e2bafb6fe


[ROCm/clr commit: 6877554f5e0011adfe9e37d10a0b5a5958928643]
---
 projects/clr/hipamd/samples/1_Utils/hipCommander/Makefile      | 3 ---
 .../clr/hipamd/samples/1_Utils/hipCommander/hipCommander.cpp   | 1 -
 2 files changed, 4 deletions(-)

diff --git a/projects/clr/hipamd/samples/1_Utils/hipCommander/Makefile b/projects/clr/hipamd/samples/1_Utils/hipCommander/Makefile
index e770c636a4..a411763b7f 100644
--- a/projects/clr/hipamd/samples/1_Utils/hipCommander/Makefile
+++ b/projects/clr/hipamd/samples/1_Utils/hipCommander/Makefile
@@ -10,9 +10,6 @@ OPT=-O3
 CXXFLAGS =  $(OPT) --std=c++11
 
 HIP_PLATFORM=$(shell $(HIP_PATH)/bin/hipconfig --platform)
-ifeq (${HIP_PLATFORM}, hcc)
-	CXXFLAGS += " -stdlib=libc++"
-endif
 
 CODE_OBJECTS=nullkernel.hsaco
 
diff --git a/projects/clr/hipamd/samples/1_Utils/hipCommander/hipCommander.cpp b/projects/clr/hipamd/samples/1_Utils/hipCommander/hipCommander.cpp
index 0add1ce3e3..4b93180b18 100644
--- a/projects/clr/hipamd/samples/1_Utils/hipCommander/hipCommander.cpp
+++ b/projects/clr/hipamd/samples/1_Utils/hipCommander/hipCommander.cpp
@@ -11,7 +11,6 @@
 #include <elf.h>
 #include <hsa/hsa.h>
 #include <hc.hpp>
-#include <hip/hcc_detail/hcc_acc.h>
 #endif
 
 #include <sys/time.h>