modules/gnome.py: Fix generating .gir with latest Windows SDK #13392
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fanc999-1
force-pushed
the
gir-windows-sdk-26100
branch
6 times, most recently
from
e75acec
to
c7f6c3c
Compare
...when a Visual Studio-style compiler is being used. The scanner and dumper programs for gtkdoc and introspection will fail to link with an obscure undefined symbol '_guard_check_icall_$fo$' without an appropriate CRT cflag (i.e. /MD or /MDd for instance) specified, when the latest Windows SDK (10.0.26100.0 or later) is being used on Visual Studio 2019 at least. This will update the private _get_langs_compilers_flags() if a Visual Studio style compiler is being used, as indicated by the b_vscrt option. This applies the appropriate CRT cflag according to the build options so that this issue will be avoided.
fanc999-1
force-pushed
the
gir-windows-sdk-26100
branch
from
c7f6c3c
to
eef7a2a
Compare
dnicolodi
reviewed
Nov 27, 2024
|
|
||
| for lang, compiler in langs_compilers: | ||
| if len(crt_cflags) == 0 and OptionKey('b_vscrt') in compiler.base_options: |
There was a problem hiding this comment.
Suggested change
| if len(crt_cflags) == 0 and OptionKey('b_vscrt') in compiler.base_options: | |
| if not crt_cflags and OptionKey('b_vscrt') in compiler.base_options: |
dnicolodi
reviewed
Nov 27, 2024
| # _guard_check_icall_$fo$ | ||
| crt_val = state.environment.coredata.get_option(OptionKey('b_vscrt')) | ||
| buildtype = state.environment.coredata.get_option(OptionKey('buildtype')) | ||
| if isinstance(crt_val, str) and isinstance(buildtype, str): |
There was a problem hiding this comment.
Why are the isinstance() check needed?
dnicolodi
reviewed
Nov 27, 2024
| @@ -1157,6 +1166,8 @@ def generate_gir(self, state: 'ModuleState', args: T.Tuple[T.List[T.Union[Execut | |||
| dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes, depends = \ | |||
| self._get_dependencies_flags(deps, state, depends, use_gir_args=True) | |||
| scan_cflags = [] | |||
| if len(crt_cflags) > 0: | |||
There was a problem hiding this comment.
Suggested change
| if len(crt_cflags) > 0: | |
| if crt_cflags: |
There was a problem hiding this comment.
However, if crt_flags is a list, the check can be omitted.
dnicolodi
reviewed
Nov 27, 2024
| @@ -1572,6 +1583,8 @@ def _get_build_args(self, c_args: T.List[str], inc_dirs: T.List[T.Union[str, bui | |||
| compiler = state.environment.coredata.compilers[MachineChoice.HOST]['c'] | |||
|
|
|||
| compiler_flags = self._get_langs_compilers_flags(state, [('c', compiler)]) | |||
| if len(compiler_flags[3]) > 0: | |||
| cflags.extend(compiler_flags[3]) # Apply CRT cflag first if necessary | |||
There was a problem hiding this comment.
Also here, I think the check can be omitted.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
...when a Visual Studio-style compiler is being used.
The dumper program will fail to link with an obscure undefined symbol 'guard_check_icall$fo$ ' without an appropriate CRT cflag (i.e. /MD or /MDd for instance) specified, when the latest Windows SDK (10.0.26100.0 or later) is being used on Visual Studio 2019 at least.
This applies the appropriate CRT cflag according to the build options during introspection scanning so that this issue will be avoided.