diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index db58f9e44d..bb9422ba14 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/bin/hipcc
@@ -199,12 +199,7 @@ if ($hasCU and $HIP_PLATFORM eq 'hcc') {
 
 if ($setStdLib eq 0 and $HIP_PLATFORM eq 'hcc')
 {
-    $defaultLibCpp = 0;   # TODO - should be 0 for best interop with G++
-    if ($defaultLibCpp) {
-        $HIPCXXFLAGS .= " -stdlib=libc++";  # TODO - remove me, defaults to libc++.
-    } else {
-        $HIPCXXFLAGS .= " -stdlib=libstdc++";
-    }
+    $HIPCXXFLAGS .= " -stdlib=libstdc++";
 }
 
 if ($needHipHcc) {