From 2fefa95339788efd5d13442ebd415d1869f335ac Mon Sep 17 00:00:00 2001 From: zuyu Date: Tue, 5 Nov 2024 19:48:23 -0800 Subject: [PATCH] Minor cleanup in CMakeLists --- CMake/resolve_dependency_modules/folly/CMakeLists.txt | 4 ---- CMakeLists.txt | 5 ----- 2 files changed, 9 deletions(-) diff --git a/CMake/resolve_dependency_modules/folly/CMakeLists.txt b/CMake/resolve_dependency_modules/folly/CMakeLists.txt index 7eac711b251b..9e79e0b0ba0a 100644 --- a/CMake/resolve_dependency_modules/folly/CMakeLists.txt +++ b/CMake/resolve_dependency_modules/folly/CMakeLists.txt @@ -36,10 +36,6 @@ FetchContent_Declare( PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/folly-no-export.patch ${glog_patch}) -if(ON_APPLE_M1) - # folly will wrongly assume x86_64 if this is not set - set(CMAKE_LIBRARY_ARCHITECTURE aarch64) -endif() # Suppress all warnings set(FOLLY_CXX_FLAGS -w) # Enable INT128 support diff --git a/CMakeLists.txt b/CMakeLists.txt index 99a791e56b21..1ce861c49d25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,11 +286,6 @@ if(UNIX AND NOT APPLE) add_link_options("-Wl,-export-dynamic") endif() -if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" AND ${CMAKE_SYSTEM_NAME} MATCHES - "Darwin") - set(ON_APPLE_M1 True) -endif() - # Required so velox code can be used in a dynamic library set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)