diff --git a/var/spack/repos/builtin/packages/hpcg/package.py b/var/spack/repos/builtin/packages/hpcg/package.py
index 4de150cda2e..2f68d940546 100644
--- a/var/spack/repos/builtin/packages/hpcg/package.py
+++ b/var/spack/repos/builtin/packages/hpcg/package.py
@@ -23,6 +23,7 @@ class Hpcg(AutotoolsPackage):
     variant('openmp', default=True, description='Enable OpenMP support')
 
     patch('https://github.com/hpcg-benchmark/hpcg/commit/e9e0b7e6cae23e1f30dd983c2ce2d3bd34d56f75.patch', sha256='23b9de83042eb7a8207fdddcfa79ae2cc1a17e8e623e2224c7751d7c328ee482', when='%gcc@9:')
+    patch('https://github.com/hpcg-benchmark/hpcg/commit/e9e0b7e6cae23e1f30dd983c2ce2d3bd34d56f75.patch', sha256='23b9de83042eb7a8207fdddcfa79ae2cc1a17e8e623e2224c7751d7c328ee482', when='%aocc')
 
     depends_on('mpi@1.1:')
 
@@ -30,8 +31,9 @@ class Hpcg(AutotoolsPackage):
     build_targets = ['arch={0}'.format(arch)]
 
     def configure(self, spec, prefix):
-        CXXFLAGS = '-O3 -ffast-math '
-        CXXFLAGS += '-ftree-vectorize -ftree-vectorizer-verbose=0 '
+        CXXFLAGS = '-O3 -ffast-math -ftree-vectorize '
+        if '%aocc' not in self.spec:
+            CXXFLAGS += ' -ftree-vectorizer-verbose=0 '
         if '+openmp' in self.spec:
             CXXFLAGS += self.compiler.openmp_flag
         config = [