Ensure -I and -L options passed via the environment do not take priority over
build-specific ones which might cause issues when upgrading a port.
--- giscanner/dumper.py.orig	2025-09-13 15:08:06
+++ giscanner/dumper.py	2026-05-04 19:26:51
@@ -216,16 +216,6 @@
                     args.append('-Wl,--export-all-symbols')
                 else:
                     args.append('-export-dynamic')
-
-        if not self._compiler.check_is_msvc():
-            # These envvars are not used for MSVC Builds!
-            # MSVC Builds use the INCLUDE, LIB envvars,
-            # which are automatically picked up during
-            # compilation and linking
-            for cppflag in shlex.split(os.environ.get('CPPFLAGS', '')):
-                args.append(cppflag)
-            for cflag in shlex.split(os.environ.get('CFLAGS', '')):
-                args.append(cflag)
 
         # Make sure to list the library to be introspected first since it's
         # likely to be uninstalled yet and we want the uninstalled RPATHs have
@@ -262,6 +252,14 @@
             args.extend(rpath_entries_to_add)
 
         if not self._compiler.check_is_msvc():
+            # These envvars are not used for MSVC Builds!
+            # MSVC Builds use the INCLUDE, LIB envvars,
+            # which are automatically picked up during
+            # compilation and linking
+            for cppflag in shlex.split(os.environ.get('CPPFLAGS', '')):
+                args.append(cppflag)
+            for cflag in shlex.split(os.environ.get('CFLAGS', '')):
+                args.append(cflag)
             for ldflag in shlex.split(os.environ.get('LDFLAGS', '')):
                 if ldflag != '-Wl,--as-needed':
                     args.append(ldflag)