Skip to content

Commit

Permalink
MAINT: Minor cleanup, don't try static bundling
Browse files Browse the repository at this point in the history
  • Loading branch information
HaoZeke committed Jul 2, 2023
1 parent 5b32ec9 commit 2674692
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 4 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ build-backend = "mesonpy"
setup = ['-Dwith_pybind11=True',
'-Dhighsint64=False',
'-Dwrap_mode=forcefallback',
'-Dlayout=flat',
'--default-library=static',
]
dist = ['--include-subprojects']

Expand Down

0 comments on commit 2674692

Please sign in to comment.