Skip to content

Commit 88b1e4b

Browse files
committed
Merge #10971: build: fix missing sse42 in depends builds
9baca41 build: always attempt to enable targeted sse42 cxxflags (Cory Fields) Pull request description: For depends builds without this, configure thinks that the user has overridden CXXFLAGS manually, when really they've just been set by the config.site. The effect is that warnings and extra cxxflags (sse4.2 for example) were not being added. Tree-SHA512: 9fd615ad0e926bd9d6b541ffcf7fc555e2147e8761f57ff3b5fb5d196c9cef0f26aa99681ff72db8c83c0f9a7ed91f4253f46bab09f2c835044b68047358fa47
2 parents 2361208 + 9baca41 commit 88b1e4b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

configure.ac

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,13 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
258258
AX_CHECK_COMPILE_FLAG([-Wunused-local-typedef],[CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef"],,[[$CXXFLAG_WERROR]])
259259
AX_CHECK_COMPILE_FLAG([-Wdeprecated-register],[CXXFLAGS="$CXXFLAGS -Wno-deprecated-register"],,[[$CXXFLAG_WERROR]])
260260
AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough],[CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"],,[[$CXXFLAG_WERROR]])
261-
262-
# Check for optional instruction set support. Enabling these does _not_ imply that all code will
263-
# be compiled with them, rather that specific objects/libs may use them after checking for runtime
264-
# compatibility.
265-
AX_CHECK_COMPILE_FLAG([-msse4.2],[[SSE42_CXXFLAGS="-msse4.2"]],,[[$CXXFLAG_WERROR]])
266-
267261
fi
268262

263+
# Check for optional instruction set support. Enabling these does _not_ imply that all code will
264+
# be compiled with them, rather that specific objects/libs may use them after checking for runtime
265+
# compatibility.
266+
AX_CHECK_COMPILE_FLAG([-msse4.2],[[SSE42_CXXFLAGS="-msse4.2"]],,[[$CXXFLAG_WERROR]])
267+
269268
TEMP_CXXFLAGS="$CXXFLAGS"
270269
CXXFLAGS="$CXXFLAGS $SSE42_CXXFLAGS"
271270
AC_MSG_CHECKING(for assembler crc32 support)

0 commit comments

Comments
 (0)