Preserve options set by CMakeMake configure_step

Author: Crivella

easybuild/easyblocks/l/llvm.py

@@ -127,7 +127,6 @@
     'Python3_FIND_VIRTUALENV': 'STANDARD',
     'LLVM_INSTALL_UTILS': 'ON',
     'LLVM_INCLUDE_BENCHMARKS': 'OFF',
-    'CMAKE_VERBOSE_MAKEFILE': 'ON',
 }
 
 
@@ -343,11 +342,6 @@ def __init__(self, *args, **kwargs):
             else:
                 self.log.info("Using AMDGPU targets: %s", ', '.join(self.amd_gfx))
 
-        general_opts['CMAKE_BUILD_TYPE'] = self.build_type
-        general_opts['CMAKE_INSTALL_PREFIX'] = self.installdir
-        if self.toolchain.options['pic']:
-            general_opts['CMAKE_POSITION_INDEPENDENT_CODE'] = 'ON'
-
         general_opts['LLVM_TARGETS_TO_BUILD'] = '"%s"' % ';'.join(build_targets)
 
         self._cmakeopts = {}
@@ -494,6 +488,20 @@ def configure_step(self):
             builddir=self.llvm_obj_dir_stage1,
             srcdir=os.path.join(self.llvm_src_dir, "llvm")
             )
+        # Inherit _cfgopts from the configure_step of CMakeMake parent class
+        for item in self.cfg.get('configopts', '').split():
+            if not item:
+                continue
+            if item.startswith('-D'):
+                key = item.split('=')[0][2:]
+                # Skip flags that where already set by _cmakeopts to allow overriding them in multistage build
+                if key in self._cmakeopts:
+                    continue
+                # Skip compiler options to allow overriding in multistage build
+                # They were already set and used for the 1st stage build
+                if key.endswith('_COMPILER'):
+                    continue
+            self._cfgopts.append(item)
 
     def disable_sanitizer_tests(self):
         """Disable the tests of all the sanitizers by removing the test directories from the build system"""
@@ -507,7 +515,9 @@ def add_cmake_opts(self):
         """Add LLVM-specific CMake options."""
         base_opts = self._cfgopts.copy()
         for k, v in self._cmakeopts.items():
-            base_opts.append('-D%s=%s' % (k, v))
+            chk = '-D%s=' % k
+            if not any(opt.startswith(chk) for opt in self._cfgopts):
+                base_opts.append('-D%s=%s' % (k, v))
         self.cfg['configopts'] = ' '.join(base_opts)
 
     def configure_step2(self):