From 37114d84b47b69ddafe5e2ee0c80870a6547a003 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 17 Jan 2025 14:03:48 -0800 Subject: [PATCH 1/2] Update [ghstack-poisoned] --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a9102848de..ca10b1bdb9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ endif() # they can be properly gc'd. -s: strip symbol. -fno-exceptions -fno-rtti: # disables exceptions and runtime type. set(CMAKE_CXX_FLAGS_RELEASE - "-ffunction-sections -fdata-sections -fno-exceptions -fno-rtti" + "-ffunction-sections -fdata-sections -fno-exceptions -fno-rtti ${CMAKE_CXX_FLAGS_RELEASE}" ) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") @@ -157,11 +157,11 @@ endif() option(OPTIMIZE_SIZE "Build executorch runtime optimizing for binary size" OFF) if(OPTIMIZE_SIZE) - # -Os: Optimize for size - set(CMAKE_CXX_FLAGS_RELEASE "-Os ${CMAKE_CXX_FLAGS_RELEASE}") + # -Os: Optimize for size. + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") else() # -O2: Moderate opt. - set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") endif() set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") From 65d055922d2144e459c5cc87eed3bfd16858f4d1 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 17 Jan 2025 14:03:52 -0800 Subject: [PATCH 2/2] Update [ghstack-poisoned] --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca10b1bdb9c..a6efb3d4623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,8 +164,6 @@ else() set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") endif() -set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") - option(EXECUTORCH_BUILD_ANDROID_JNI "Build Android JNI" OFF) option(EXECUTORCH_BUILD_ARM_BAREMETAL