Merge pull request #1216 from brjsp:master

PiperOrigin-RevId: 460478343 Change-Id: I58e2e1fb7b1776f37b1254ba5fd74d56b44cb4d0
2 years ago · 90099691ac
parent 504229dfa4 09e9604999
commit 90099691ac
1 changed files with 3 additions and 0 deletions
--- a/CMake/AbseilHelpers.cmake
+++ b/CMake/AbseilHelpers.cmake
@ -166,6 +166,9 @@ function(absl_cc_library)
          set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
        elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
          # Don't impose our warnings on others.
+        elseif(${cflag} MATCHES "^-m")
+          # Don't impose CPU instruction requirements on others, as
+          # the code performs feature detection on runtime.
        else()
          set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
        endif()