summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-10-27 12:40:21 +0200
committerGitHub <noreply@github.com>2021-10-27 12:40:21 +0200
commit062c783e30399fad743aabeb892a362e168e788a (patch)
tree23adc40824bf7a66cc12a66dcd08f68198768b10
parent3c8d6410905d4d9d0321055504dff9acc7d34709 (diff)
parent78e2c6c94a47290d56114813e6afeb4f821c3a6f (diff)
Merge pull request #19744 from vespa-engine/toregge/diable-usage-of-rdtsc-in-protobuf-on-darwin
Disable usage of rdtsc in protobuf on darwin.
-rw-r--r--build_settings.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/build_settings.cmake b/build_settings.cmake
index ea085721bdc..a0b9ce5160a 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -87,6 +87,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden ")
endif()
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGOOGLE_PROTOBUF_NO_RDTSC")
+endif()
# Linker flags
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")