diff options
| author | L. E. Segovia <amy@centricular.com> | 2024-10-30 09:40:05 -0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2024-10-31 14:52:35 +0000 |
| commit | 51556b295df0fda310c2277baa38bf0104e924c8 (patch) | |
| tree | aae454863cb6936b9a7786ff346657b59a24f765 | |
| parent | 15dcc225e3442e04bf6ebc72298d1276a1c0b526 (diff) | |
cerbero: Don't enable MinGW variant by default for non-Windows-hosted builds
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1615>
| -rw-r--r-- | cerbero/config.py | 7 | ||||
| -rw-r--r-- | config/cross-win32.cbc | 3 | ||||
| -rw-r--r-- | config/cross-win64.cbc | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/cerbero/config.py b/cerbero/config.py index 74dde0f0..726216a2 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -365,11 +365,8 @@ class Config(object): self.load_defaults() # Use Visual Studio by default when building on Windows - if not self.variants.mingw and not self.variants.visualstudio: - if self.platform == Platform.WINDOWS: - self.variants.override(['visualstudio']) - else: - self.variants.override(['mingw']) + if not self.variants.mingw and not self.variants.visualstudio and self.platform == Platform.WINDOWS: + self.variants.override(['visualstudio']) # Next parse the user configuration file USER_CONFIG_FILE # which overrides the defaults diff --git a/config/cross-win32.cbc b/config/cross-win32.cbc index e1631006..0facc478 100644 --- a/config/cross-win32.cbc +++ b/config/cross-win32.cbc @@ -6,3 +6,6 @@ target_arch=Architecture.X86 target_distro=Distro.WINDOWS target_distro_version=DistroVersion.WINDOWS_7 build = 'x86_64-linux-gnu' + +# Needs GCC with DWARF2 +variants.override(['norust', 'mingw']) diff --git a/config/cross-win64.cbc b/config/cross-win64.cbc index a31b0a1f..c82d8ff7 100644 --- a/config/cross-win64.cbc +++ b/config/cross-win64.cbc @@ -6,3 +6,5 @@ target_arch=Architecture.X86_64 target_distro=Distro.WINDOWS target_distro_version=DistroVersion.WINDOWS_7 build = 'x86_64-linux-gnu' + +variants.override(['mingw']) |