From 965e2e00a8f26f9df78a850648e49b8c9b4be652 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Tue, 18 Oct 2016 22:45:45 -0500
Subject: [PATCH] Make HIP_HCC_SYS_INCLUDES_WA disable unless explicitly set =1

Change-Id: Ibfd1e049d51e420bd514b71e3652bc7029dfd4ba
---
 hipamd/bin/hipcc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index ebce3414ae..824dd8b63d 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/bin/hipcc
@@ -92,8 +92,8 @@ if ($HIP_PLATFORM eq "hcc") {
     $HIPCXXFLAGS = $HCCFLAGS;
 
     #### GCC system includes workaround ####
-    $WA = $ENV{'HCC_SYS_INCLUDES_WA'};
-    if (!defined($WA) || ${WA} ne "0") {
+    $WA = $ENV{'HIP_HCC_SYS_INCLUDES_WA'};
+    if (defined($WA) and ${WA} ne "0") {
         my $GCC_CUR_VER = `gcc -dumpversion`;
         my $GPP_CUR_VER = `g++ -dumpversion`;
         $GCC_CUR_VER =~ s/\R//g;