From 2674692ec0c38bb50f62b874981c3d75aeb30022 Mon Sep 17 00:00:00 2001 From: Rohit Goswami Date: Sun, 2 Jul 2023 06:32:49 +0000 Subject: [PATCH] MAINT: Minor cleanup, don't try static bundling Not supported: https://github.com/mesonbuild/meson-python/discussions/410 --- meson.build | 7 ++++--- pyproject.toml | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 76c7abdbb0..66fad63c0d 100644 --- a/meson.build +++ b/meson.build @@ -37,7 +37,7 @@ endif cpu_family = host_machine.cpu_family() -if cpu_family in ['x86_64', 'i686'] +if cpu_family in ['x86_64', 'i686'] and not is_windows add_project_arguments('-mpopcnt', language: 'cpp') endif if cpu_family in ['ppc64', 'powerpc64'] and not meson.is_cross_build() @@ -46,8 +46,9 @@ endif if is_mingw # For mingw-w64, don't use LTO - gcc_link_args = ['-fno-use-linker-plugin'] - add_project_link_arguments(gcc_link_args, language: ['c', 'cpp']) + add_project_arguments('-fno-use-linker-plugin', language: ['c', 'cpp']) + # Link statically against the UCRT [kanged, numpy] + add_project_link_arguments(['-lucrt', '-static'] , language:['c', 'cpp']) endif # --------------------- Dependencies diff --git a/pyproject.toml b/pyproject.toml index 7d438bbb2f..b15a0263d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,8 +24,6 @@ build-backend = "mesonpy" setup = ['-Dwith_pybind11=True', '-Dhighsint64=False', '-Dwrap_mode=forcefallback', - '-Dlayout=flat', - '--default-library=static', ] dist = ['--include-subprojects']