Revert "Fixed sonarcloud complaints"

This reverts commit f4a827e.

Author: aabmets

quantcrypt/internal/compiler.py

@@ -110,18 +110,6 @@ def include_directive(self) -> str:
         header_file = self.source_dir / "api.h"
         return f'#include "{header_file.as_posix()}"'
 
-    def _add_linux_compiler_args(self, extra_flags: list[str]) -> None:
-        arch = platform.machine().lower()
-        extra_flags.append("-s")
-        if arch in const.AMDArches:
-            for flag in self.required_flags:
-                extra_flags.append(f"-m{flag.lower()}")
-        elif arch in const.ARMArches:
-            march_flag = "-march=armv8.5-a"
-            for flag in self.required_flags:
-                march_flag += f"+{flag.lower()}"
-            extra_flags.append(march_flag)
-
     @property
     def compiler_args(self) -> list[str]:  # pragma: no cover
         opsys = platform.system().lower()
@@ -140,7 +128,17 @@ def compiler_args(self) -> list[str]:  # pragma: no cover
                 extra_flags.append(f"/arch:{flag.upper()}")
             return ["/O2", "/MD", "/nologo", *extra_flags]
         elif opsys == "linux":
-            self._add_linux_compiler_args(extra_flags)
+            extra_flags.append("-s")
+            if arch in const.AMDArches:
+                for flag in self.required_flags:
+                    extra_flags.append(f"-m{flag.lower()}")
+            elif arch in const.ARMArches:
+                march_flag = "-march=armv8.5-a"
+                for flag in self.required_flags:
+                    march_flag += f"+{flag.lower()}"
+                extra_flags.append(march_flag)
+        elif opsys == "darwin":
+            pass
 
         unix_flags.extend(extra_flags)
         return unix_flags

quantcrypt/internal/pqclean.py

@@ -152,12 +152,9 @@ def read_algo_metadata(spec: const.AlgoSpec) -> PQAMetaData:
     return PQAMetaData(**data)
 
 
-def check_opsys_support(spf: PQASupportedPlatform, variant: const.PQAVariant) -> str | None:
+def check_opsys_support(spf: PQASupportedPlatform) -> str | None:
     for opsys in spf.operating_systems:
         if platform.system().lower() == opsys.lower():
-            for x, y in const.ExcludedCombinations:
-                if x == opsys and y == variant:  # pragma: no cover
-                    return None
             return opsys.lower()
     return None
 
@@ -187,9 +184,12 @@ def check_platform_support(
         if not spf:
             return None, None
         if spf.operating_systems:
-            opsys = check_opsys_support(spf, variant)
+            opsys = check_opsys_support(spf)
             if not opsys:
                 return None, None
+            for x, y in const.ExcludedCombinations:
+                if x == opsys and y == variant:  # pragma: no cover
+                    return None, None
         if spf.required_flags:  # pragma: no branch
             required_flags = spf.required_flags