compiletools 5.3.0__tar.gz → 5.3.3__tar.gz

{compiletools-5.3.0 → compiletools-5.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compiletools
-Version: 5.3.0
+Version: 5.3.3
 Summary: Tools to make compiling C/C++ projects easy
 Keywords: c++,make,development
 Author: DrGeoff
@@ -23,7 +23,7 @@ Requires-Dist: rich>=12.0.0
 Requires-Dist: rich-rst>=1.1.7
 Requires-Dist: stringzilla>=3.0.0
 Requires-Dist: bump-my-version>=0.26.0 ; extra == 'dev'
-Requires-Dist: twine>=5.3.0 ; extra == 'dev'
+Requires-Dist: twine>=5.0.0 ; extra == 'dev'
 Requires-Dist: pytest>=7.0.0 ; extra == 'dev'
 Requires-Dist: pytest-xdist>=3.0.0 ; extra == 'dev'
 Requires-Dist: ruff>=0.12.9 ; extra == 'dev'
@@ -47,7 +47,7 @@ C/C++ build tools that requires almost no configuration.
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-09
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "compiletools"
-version = "5.3.0"
+version = "5.3.3"
 description = "Tools to make compiling C/C++ projects easy"
 readme = "src/compiletools/README.ct-doc.rst"
 requires-python = ">=3.9"
@@ -33,7 +33,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "bump-my-version>=0.26.0",
-    "twine>=5.3.0",
+    "twine>=5.0.0",
     "pytest>=7.0.0",
     "pytest-xdist>=3.0.0",
     "ruff>=0.12.9",
@@ -83,7 +83,7 @@ include = [
 ]
 
 [tool.bumpversion]
-current_version = "5.3.0"
+current_version = "5.3.3"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-cache-clean.rst

@@ -9,7 +9,7 @@ Remove the current dependency cache
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-23
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-cache.rst

@@ -9,7 +9,7 @@ Where is the dependency information used by the ct-* applications stored
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-21
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-cake.rst

@@ -9,7 +9,7 @@ Swiss army knife for building a C/C++ project
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-commandline.rst

@@ -9,7 +9,7 @@ This document describes the command line arguments that are common across ct-* p
 :Author: drgeoffathome@gmail.com
 :Date:   2017-07-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-config.rst

@@ -9,7 +9,7 @@ Helper tool for examining ct-* configuration
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-16
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-doc.rst

@@ -12,7 +12,7 @@ C/C++ build tools that requires almost no configuration.
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-09
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-filelist.rst

@@ -9,7 +9,7 @@ Determine header and source dependencies of a C/C++ file by following headers an
 :Author: drgeoffathome@gmail.com
 :Date:   2017-07-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-findtargets.rst

@@ -9,7 +9,7 @@ What
 :Author: drgeoffathome@gmail.com
 :Date:   2018-04-17
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-gitroot.rst

@@ -9,7 +9,7 @@ What directory is the root of the git repository?
 :Author: drgeoffathome@gmail.com
 :Date:   2017-09-28
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-headertree.rst

@@ -9,7 +9,7 @@ Create a tree of header dependencies starting at the given C/C++ file
 :Author: drgeoffathome@gmail.com
 :Date:   2018-07-26
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-jobs.rst

@@ -9,7 +9,7 @@ How many jobs to run concurrently by the ct-* applications.
 :Author: drgeoffathome@gmail.com
 :Date:   2017-04-28
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-list-variants.rst

@@ -9,7 +9,7 @@ Locates available variants for use by the ct-* applications
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-16
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/README.ct-magicflags.rst

@@ -9,7 +9,7 @@ Show the magic flags / magic comments that a file exports
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-23
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 5.3.0
+:Version: 5.3.3
 :Manual section: 1
 :Manual group: developers
 

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/apptools.py

@@ -15,7 +15,7 @@ from compiletools.version import __version__
 import compiletools.git_utils
 import compiletools.configutils
 import compiletools.utils
-from compiletools.utils import cached_shlex_split
+from compiletools.utils import split_command_cached
 import compiletools.dirnamer
 
 try:
@@ -362,9 +362,9 @@ def extract_system_include_paths(args, flag_sources=None, verbose=0):
         if not flag_value:
             continue
             
-        # Use existing shlex functionality from cached_shlex_split
+        # Use existing shlex functionality from split_command_cached
         try:
-            tokens = cached_shlex_split(flag_value)
+            tokens = split_command_cached(flag_value)
         except ValueError:
             # Fall back to simple split if shlex fails
             tokens = flag_value.split()
@@ -463,7 +463,7 @@ def extract_command_line_macros(args, flag_sources=None, include_compiler_macros
             
         # Use shlex.split for robust parsing
         try:
-            flags = cached_shlex_split(flag_string)
+            flags = split_command_cached(flag_string)
         except ValueError:
             # Fallback to simple split if shlex fails on malformed input
             flags = flag_string.split()
@@ -805,6 +805,19 @@ def _do_xxpend(args, name):
             setattr(args, name, attr)
 
 
+def _deduplicate_all_flags(args):
+    """Deduplicate all compiler and linker flags after all processing is complete"""
+    flaglist = ("CPPFLAGS", "CFLAGS", "CXXFLAGS", "LDFLAGS")
+    for flag_name in flaglist:
+        if hasattr(args, flag_name):
+            flag_value = getattr(args, flag_name)
+            if flag_value:
+                # Split the flag string into individual flags and deduplicate
+                deduplicated_flags = compiletools.utils.combine_and_deduplicate_compiler_flags(flag_value)
+                # Convert back to space-separated string
+                setattr(args, flag_name, " ".join(deduplicated_flags))
+
+
 def _tier_one_modifications(args):
     """Do some early modifications that can potentially cause
     downstream modifications.
@@ -817,6 +830,9 @@ def _tier_one_modifications(args):
     for flag in flaglist:
         _do_xxpend(args, flag)
 
+    # Deduplicate all compiler/linker flags after all processing is complete
+    _deduplicate_all_flags(args)
+
     # Cake used preprocess to mean both magic flag preprocess and headerdeps preprocess
     if hasattr(args, "preprocess") and args.preprocess:
         args.magic = "cpp"
@@ -834,7 +850,7 @@ def _strip_quotes(args):
         if value is not None:
             # Can't just use the for loop directly because that would
             # try and process every character in a string
-            if compiletools.utils.is_nonstr_iter(value):
+            if compiletools.utils.is_non_string_iterable(value):
                 for index, element in enumerate(value):
                     value[index] = _safely_unquote_string(element)
             else:
@@ -863,7 +879,7 @@ def _safely_unquote_string(value):
     try:
         # Use shlex to parse the string as shell would
         # If it parses to exactly one token, it was properly quoted
-        tokens = cached_shlex_split(value)
+        tokens = split_command_cached(value)
         if len(tokens) == 1:
             # Single token means the quotes were shell quotes
             unquoted = tokens[0]

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/cake.py

@@ -98,8 +98,8 @@ class Cake(object):
         cap.add(
             "--compilation-database-output",
             dest="compilation_database_output",
-            default="compile_commands.json",
-            help="Output filename for compilation database (default: compile_commands.json)"
+            default=None,
+            help="Output filename for compilation database (default: <gitroot>/compile_commands.json)"
         )
         
         cap.add(
@@ -177,7 +177,7 @@ class Cake(object):
             for srcexe in filelist:
                 base = os.path.basename(srcexe)
                 destexe = compiletools.wrappedos.realpath(os.path.join(outputdir, base))
-                if compiletools.utils.isexecutable(srcexe) and srcexe != destexe:
+                if compiletools.utils.is_executable(srcexe) and srcexe != destexe:
                     if self.args.verbose > 0:
                         print("".join([outputdir, base]))
                     compiletools.wrappedos.copy(srcexe, outputdir)

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/compilation_database.py

@@ -26,12 +26,6 @@ class CompilationDatabaseCreator:
         self.magicparser = magicparser if magicparser is not None else compiletools.magicflags.create(args, self.headerdeps)
         self.hunter = hunter if hunter is not None else compiletools.hunter.Hunter(args, self.headerdeps, self.magicparser)
             
-    def _normalize_path_sz(self, file_path: str) -> str:
-        """Normalize file path using wrappedos with shared StringZilla-aware cache"""
-        # Use enhanced wrappedos.abspath that handles both Python str and StringZilla Str
-        return compiletools.wrappedos.abspath(file_path)
-    
-        
     @staticmethod
     def add_arguments(cap):
         """Add command-line arguments for standalone ct-compilation-database"""
@@ -41,8 +35,8 @@ class CompilationDatabaseCreator:
         cap.add(
             "--compilation-database-output",
             dest="compilation_database_output",
-            default="compile_commands.json",
-            help="Output filename for compilation database (default: compile_commands.json)"
+            default=None,
+            help="Output filename for compilation database (default: <gitroot>/compile_commands.json)"
         )
 
         cap.add(
@@ -54,45 +48,51 @@ class CompilationDatabaseCreator:
 
     def _get_compiler_command(self, source_file: str) -> List[str]:
         """Generate compiler command arguments for a source file with StringZilla optimization"""
-        
+
         # Determine compiler based on file extension
         if compiletools.utils.is_cpp_source(source_file):
             compiler = self.args.CXX
         else:
             compiler = self.args.CC
+
+        # Build arguments list - properly split compiler command if it contains multiple tokens
+        args = []
+        if compiler:
+            # Split compiler command (e.g., "ccache g++" -> ["ccache", "g++"])
+            compiler_parts = compiletools.utils.split_command_cached(compiler)
+            args.extend(compiler_parts)
+        else:
+            # If no compiler is set, we can't generate a valid command
+            return []
         
-        # Build arguments list
-        args = [compiler]
-        
-        # Add standard flags
-        if hasattr(self.args, 'CPPFLAGS') and self.args.CPPFLAGS:
-            if isinstance(self.args.CPPFLAGS, list):
-                args.extend(self.args.CPPFLAGS)
-            else:
-                args.extend(compiletools.utils.cached_shlex_split(self.args.CPPFLAGS))
-                
+        # Get magic flags for this specific file
+        try:
+            magic_flags = self.magicparser.parse(source_file)
+        except Exception as e:
+            # Magic flags parsing may fail for various reasons
+            if self.args.verbose >= 2:
+                print(f"Warning: Could not parse magic flags for {source_file}: {e}")
+            magic_flags = {}
+
+        # Combine and deduplicate all flag sources
         if compiletools.utils.is_cpp_source(source_file):
-            if hasattr(self.args, 'CXXFLAGS') and self.args.CXXFLAGS:
-                if isinstance(self.args.CXXFLAGS, list):
-                    args.extend(self.args.CXXFLAGS)
-                else:
-                    args.extend(compiletools.utils.cached_shlex_split(self.args.CXXFLAGS))
+            # C++ source: combine CPPFLAGS + CXXFLAGS from both args and magic flags
+            combined_flags = compiletools.utils.combine_and_deduplicate_compiler_flags(
+                getattr(self.args, 'CPPFLAGS', None),
+                magic_flags.get("CPPFLAGS", []),
+                getattr(self.args, 'CXXFLAGS', None),
+                magic_flags.get("CXXFLAGS", [])
+            )
         else:
-            if hasattr(self.args, 'CFLAGS') and self.args.CFLAGS:
-                args.extend(compiletools.utils.cached_shlex_split(self.args.CFLAGS))
-            
-        # Add magic flags for this specific file
-        try:
-            magic_cppflags = self.magicparser.getmagic_cppflags_for_file(source_file)
-            if magic_cppflags:
-                args.extend(compiletools.utils.cached_shlex_split(magic_cppflags))
-                
-            magic_cxxflags = self.magicparser.getmagic_cxxflags_for_file(source_file)
-            if magic_cxxflags:
-                args.extend(compiletools.utils.cached_shlex_split(magic_cxxflags))
-        except AttributeError:
-            # Magic flags methods may not exist
-            pass
+            # C source: combine CPPFLAGS + CFLAGS from both args and magic flags
+            combined_flags = compiletools.utils.combine_and_deduplicate_compiler_flags(
+                getattr(self.args, 'CPPFLAGS', None),
+                magic_flags.get("CPPFLAGS", []),
+                getattr(self.args, 'CFLAGS', None),
+                magic_flags.get("CFLAGS", [])
+            )
+
+        args.extend(combined_flags)
         
         # Add compile-only flag
         args.extend(["-c"])
@@ -101,25 +101,29 @@ class CompilationDatabaseCreator:
         if self.args.compilation_database_relative:
             args.append(os.path.relpath(source_file, os.getcwd()))
         else:
-            args.append(os.path.abspath(source_file))
+            args.append(os.path.realpath(source_file))
             
         return args
 
     def _create_command_object(self, source_file: str) -> Dict[str, Any]:
         """Create a single command object for the compilation database"""
-        
+
         # Directory is always absolute (working directory)
-        directory = os.path.abspath(os.getcwd())
-            
+        directory = os.path.realpath(os.getcwd())
+
         # Get file path - relative or absolute based on option
         if self.args.compilation_database_relative:
             file_path = os.path.relpath(source_file, os.getcwd())
         else:
-            file_path = os.path.abspath(source_file)
-            
+            file_path = os.path.realpath(source_file)
+
         # Generate arguments
         arguments = self._get_compiler_command(source_file)
-        
+
+        # Skip files with empty arguments arrays - they provide no compile context
+        if not arguments:
+            return None
+
         return {
             "directory": directory,
             "file": file_path,
@@ -149,7 +153,10 @@ class CompilationDatabaseCreator:
         for source_file in source_files:
             if os.path.exists(source_file):
                 command_obj = self._create_command_object(source_file)
-                commands.append(command_obj)
+                if command_obj is not None:
+                    commands.append(command_obj)
+                elif self.args.verbose >= 2:
+                    print(f"Warning: Skipping source file with empty arguments: {source_file}")
             elif self.args.verbose >= 2:
                 print(f"Warning: Source file does not exist: {source_file}")
 
@@ -159,7 +166,7 @@ class CompilationDatabaseCreator:
         """Write the compilation database to file with incremental update support"""
         
         if output_file is None:
-            output_file = self.args.compilation_database_output
+            output_file = self.namer.compilation_database_pathname()
             
         # Create the command objects for current files
         new_commands = self.create_compilation_database()
@@ -186,15 +193,21 @@ class CompilationDatabaseCreator:
         # Merge: Keep existing entries for files we're not updating using StringZilla operations
         merged_commands = []
         
-        # Get set of files being updated using StringZilla-optimized path normalization
-        new_files = {self._normalize_path_sz(cmd["file"]) for cmd in new_commands}
-        
-        # Always use StringZilla for consistent file path operations
+        # Use StringZilla for optimal path processing performance
+        # Build set of normalized file paths from new commands
+        new_files_normalized = set()
+        for cmd in new_commands:
+            # Convert to StringZilla for optimal caching, then back to str for set
+            file_sz = sz.Str(cmd["file"])
+            normalized_sz = compiletools.wrappedos.realpath_sz(file_sz)
+            new_files_normalized.add(str(normalized_sz))
+
+        # Process existing commands with StringZilla optimization
         for existing_cmd in existing_commands:
-            # Use StringZilla Str and wrappedos for efficient path operations
+            # Convert to StringZilla for consistent processing
             existing_file_sz = sz.Str(existing_cmd["file"])
-            existing_file_normalized = self._normalize_path_sz(existing_file_sz)
-            if existing_file_normalized not in new_files:
+            existing_normalized_sz = compiletools.wrappedos.realpath_sz(existing_file_sz)
+            if str(existing_normalized_sz) not in new_files_normalized:
                 merged_commands.append(existing_cmd)
         
         # Add all new/updated entries
@@ -202,8 +215,14 @@ class CompilationDatabaseCreator:
         
         # Write merged JSON file
         try:
-            with open(output_file, 'w', encoding='utf-8') as f:
-                json.dump(merged_commands, f, indent=2, ensure_ascii=False)
+            # Ensure the output directory exists
+            output_dir = compiletools.wrappedos.dirname(output_file)
+            if output_dir and not compiletools.wrappedos.isdir(output_dir):
+                os.makedirs(output_dir, exist_ok=True)
+
+            # Use StringZilla Str.write_to for faster file writing - no GIL, no copies
+            json_content = json.dumps(merged_commands, indent=2, ensure_ascii=False)
+            sz.Str(json_content).write_to(output_file)
                 
             if self.args.verbose:
                 print(f"Written compilation database with {len(merged_commands)} entries to {output_file}")

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/filelist.py

@@ -21,12 +21,12 @@ class IndentStyle(compiletools.git_utils.NameAdjuster):
 
 class HeaderPassFilter(object):
     def __call__(self, files):
-        return {fn for fn in files if compiletools.utils.isheader(fn)}
+        return {fn for fn in files if compiletools.utils.is_header(fn)}
 
 
 class SourcePassFilter(object):
     def __call__(self, files):
-        return {fn for fn in files if compiletools.utils.issource(fn)}
+        return {fn for fn in files if compiletools.utils.is_source(fn)}
 
 
 class AllPassFilter(object):

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/findtargets.py

@@ -151,7 +151,7 @@ class FindTargets(object):
                 continue
             for filename in files:
                 pathname = os.path.join(root, filename)
-                if not compiletools.utils.issource(pathname):
+                if not compiletools.utils.is_source(pathname):
                     continue
                 with open(pathname, encoding="utf-8", errors="ignore") as ff:
                     for line in ff:

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/git_utils.py

@@ -66,7 +66,7 @@ class Project(object):
         if self._args.git_root:
             return strip_git_root(filename)
         else:
-            return compiletools.utils.removemount(filename)
+            return compiletools.utils.remove_mount(filename)
 
 
 class NameAdjuster(object):

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/headerdeps.py

@@ -7,7 +7,7 @@ from pprint import pprint
 import compiletools.wrappedos
 import compiletools.apptools
 import compiletools.utils
-from compiletools.utils import cached_shlex_split
+from compiletools.utils import split_command_cached
 import compiletools.tree as tree
 import compiletools.preprocessor
 import compiletools.compiler_macros
@@ -92,7 +92,7 @@ class HeaderDepsBase(object):
         
         # Split the flag string into individual tokens using shell parsing
         try:
-            tokens = cached_shlex_split(flag_value)
+            tokens = split_command_cached(flag_value)
         except ValueError:
             # Fall back to simple split if shlex fails
             tokens = flag_value.split()
@@ -133,7 +133,7 @@ class HeaderDepsBase(object):
         
         # Split the flag string into individual tokens using shell parsing
         try:
-            tokens = cached_shlex_split(flag_value)
+            tokens = split_command_cached(flag_value)
         except ValueError:
             # Fall back to simple split if shlex fails
             tokens = flag_value.split()

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/hunter.py

@@ -76,7 +76,7 @@ class Hunter(object):
 
         # One of the magic flags is SOURCE.  If that was present, add to the
         # file list.
-        if self.args.allow_magic_source_in_header or compiletools.utils.issource(realpath):
+        if self.args.allow_magic_source_in_header or compiletools.utils.is_source(realpath):
             todo.extend(self._extractSOURCE(realpath))
 
         # The header deps and magic flags have been parsed at this point so it
@@ -116,7 +116,7 @@ class Hunter(object):
             [
                 filename
                 for filename in self.required_files(filename)
-                if compiletools.utils.issource(filename)
+                if compiletools.utils.is_source(filename)
             ]
         )
 
@@ -155,7 +155,7 @@ class Hunter(object):
         compiletools.headerdeps.HeaderDepsBase.clear_cache()
         compiletools.magicflags.MagicFlagsBase.clear_cache()
         # Clear class-level cache
-        Hunter._magic_cache.clear()
+        # Hunter._magic_cache.clear()  # This cache doesn't exist
         # Note: Cannot clear instance-level _parse_magic caches from static method
         # Each Hunter instance will retain its own cache until the instance is destroyed
 
@@ -264,7 +264,7 @@ class Hunter(object):
                     all_sources.add(compiletools.wrappedos.realpath(source))
 
         # Cache the results as sorted absolute paths
-        self._hunted_sources = sorted(compiletools.wrappedos.realpath(src) for src in all_sources)
+        self._hunted_sources = sorted(all_sources)  # all_sources already contains realpaths
 
 
         if self.args.verbose >= 5:

{compiletools-5.3.0 → compiletools-5.3.3}/src/compiletools/magicflags.py

@@ -248,9 +248,14 @@ class MagicFlagsBase:
                 # Pass magic_flag data and filepath for structured processing
                 self._process_magic_flag(magic, flag, flagsforfilename, magic_flag, filepath)
 
-        # Deduplicate all flags while preserving order
+        # Merge deprecated LINKFLAGS into LDFLAGS before deduplication
+        if "LINKFLAGS" in flagsforfilename:
+            flagsforfilename["LDFLAGS"].extend(flagsforfilename["LINKFLAGS"])
+            del flagsforfilename["LINKFLAGS"]
+
+        # Deduplicate all flags while preserving order, with smart compiler flag handling
         for key in flagsforfilename:
-            flagsforfilename[key] = compiletools.utils.ordered_unique(flagsforfilename[key])
+            flagsforfilename[key] = compiletools.utils.deduplicate_compiler_flags(flagsforfilename[key])
 
         return flagsforfilename
 
@@ -274,7 +279,9 @@ class MagicFlagsBase:
                 for value in values:
                     flagsforfilename[key].append(value)
 
-        flagsforfilename[magic].append(flag)
+        # Split flag string into individual flags - all magic flags can contain multiple values
+        individual_flags = compiletools.utils.split_command_cached(flag)
+        flagsforfilename[magic].extend(individual_flags)
         if self._args.verbose >= 5:
             print(
                 "Using magic flag {0}={1} extracted from {2}".format(
@@ -291,7 +298,7 @@ class MagicFlagsBase:
         DirectMagicFlags.clear_cache()
         CppMagicFlags.clear_cache()
         # Clear LRU caches
-        compiletools.utils.cached_shlex_split.cache_clear()
+        compiletools.utils.split_command_cached.cache_clear()
 
 
 class DirectMagicFlags(MagicFlagsBase):