Skip to content

Commit 9d4f336

Browse files
Do not pass march=armv7-a to Meson, prevents config failure
1 parent ff4fca3 commit 9d4f336

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

3rdparty/EPMeson.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ function(ExternalProjectMeson EXTERNAL_PROJECT_NAME)
7171
STRING(REPLACE "-fno-addrsig" " " MESON_CFLAGS ${MESON_CFLAGS})
7272
STRING(REPLACE "-fno-addrsig" " " MESON_CXXFLAGS ${MESON_CXXFLAGS})
7373

74+
# Fails to build with march=armv7-a during configure stage
75+
STRING(REPLACE "-march=armv7-a" "" MESON_CFLAGS ${MESON_CFLAGS})
76+
STRING(REPLACE "-march=armv7-a" "" MESON_CXXFLAGS ${MESON_CXXFLAGS})
77+
7478
SET(MESON_ENV
7579
# https://github.com/mesonbuild/meson/issues/217
7680
# find_library is now cc.find_library and now uses the linker to check if a particular library is available (similar to how AC_CHECK_LIB does it). This means you can set the LIBRARY_PATH env variable (when using gcc/clang and the LIBPATH env variable when using MSVC) to point to your "library providing" root. It also accepts a colon-separated list of directories. This is how almost everyone does non-default-linker-search-path library searching and linking.

0 commit comments

Comments
 (0)