diff --git a/var/spack/repos/builtin/packages/llvm-openmp/package.py b/var/spack/repos/builtin/packages/llvm-openmp/package.py
old mode 100644
new mode 100755
index 166b0c7a6eff6b04637f27614e2eae50ef9a9c55..831a32f74576b21c945203627e9d4acfb5b72781
--- a/var/spack/repos/builtin/packages/llvm-openmp/package.py
+++ b/var/spack/repos/builtin/packages/llvm-openmp/package.py
@@ -18,10 +18,20 @@ class LlvmOpenmp(CMakePackage):
 
     depends_on('cmake@2.8:', type='build')
 
+    variant('multicompat', default=False,
+            description="Support gomp and the Intel openMP runtime library.")
+
     def cmake_args(self):
+
         # Disable LIBOMP_INSTALL_ALIASES, otherwise the library is installed as
         # libgomp alias which can conflict with GCC's libgomp.
-        return ['-DLIBOMP_INSTALL_ALIASES=OFF']
+        cmake_args = [
+            '-DLIBOMP_INSTALL_ALIASES=OFF'
+        ]
+        # Add optional support for both Intel and gcc compilers
+        if self.spec.satisfies('+multicompat'):
+            cmake_args.append('-DKMP_GOMP_COMPAT=1')
+        return cmake_args
 
     @property
     def libs(self):