]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Only perform auto-detection of floating point ABI on ARM arch. #895
authorNathan Moinvaziri <nathan@nathanm.com>
Sat, 20 Mar 2021 02:38:42 +0000 (19:38 -0700)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Sat, 20 Mar 2021 22:36:04 +0000 (23:36 +0100)
Co-authored-by: zhangn1985 <zhangn1985@users.noreply.github.com>
CMakeLists.txt

index b39f1322b926a85ba4bf945fc33f0ad512829339..514d2d4aaba4344b90509043c0e58ff44f9162eb 100644 (file)
@@ -205,8 +205,8 @@ else()
     if(NOT NATIVEFLAG)
         if(__GNUC__)
             if(BASEARCH_ARM_FOUND)
-                if(NOT CMAKE_C_FLAGS MATCHES "-mfloat-abi")
-                    # Check support for ARM floating point
+                if("${ARCH}" MATCHES "arm" AND NOT CMAKE_C_FLAGS MATCHES "-mfloat-abi")
+                    # Check support for ARM floating point ABI
                     execute_process(COMMAND ${CMAKE_C_COMPILER} "-dumpmachine"
                                     OUTPUT_VARIABLE GCC_MACHINE)
                     if("${GCC_MACHINE}" MATCHES "gnueabihf")