diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index bc75501621..26ea4114eb 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/bin/hipcc
@@ -735,12 +735,12 @@ if ($HIPCC_LINK_FLAGS_APPEND) {
 }
 
 my $CMD="$HIPCC";
-if ($needCXXFLAGS) {
-    $CMD .= " $HIPCXXFLAGS";
-}
 if ($needLDFLAGS and not $compileOnly) {
     $CMD .= " $HIPLDFLAGS";
 }
+if ($needCXXFLAGS) {
+    $CMD .= " $HIPCXXFLAGS";
+}
 $CMD .= " $toolArgs";
 
 if ($verbose & 0x1) {