From 6f4384d3fd0371247b74c9849fa722da80cae5ed Mon Sep 17 00:00:00 2001
From: Stephen Seo <seo.disparate@gmail.com>
Date: Wed, 15 Jan 2025 20:01:42 +0900
Subject: [PATCH] Update cmake conf: omit flags for cross compiling

---
 CMakeLists.txt | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5601cc3..0f74c6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,6 @@ target_compile_options(simplearchiver PUBLIC
     -Werror=format-security
     -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
     -D_GLIBCXX_ASSERTIONS
-    -fstrict-flex-arrays=3
     -fstack-clash-protection -fstack-protector-strong
     -Wl,-z,nodlopen -Wl,-z,noexecstack
     -Wl,-z,relro -Wl,-z,now
@@ -47,7 +46,6 @@ target_link_options(simplearchiver PUBLIC
     -Werror=format-security
     -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
     -D_GLIBCXX_ASSERTIONS
-    -fstrict-flex-arrays=3
     -fstack-clash-protection -fstack-protector-strong
     -Wl,-z,nodlopen -Wl,-z,noexecstack
     -Wl,-z,relro -Wl,-z,now
@@ -55,6 +53,15 @@ target_link_options(simplearchiver PUBLIC
     -fPIE -pie
 )
 
+if(NOT DEFINED DISABLE_FLAGS_FOR_COMPAT)
+    target_compile_options(simplearchiver PUBLIC
+        -fstrict-flex-arrays=3
+    )
+    target_link_options(simplearchiver PUBLIC
+        -fstrict-flex-arrays=3
+    )
+endif()
+
 # Inhibit format-string-related warning in src/archiver.c .
 set_source_files_properties(src/archiver.c
     PROPERTIES
@@ -64,12 +71,20 @@ set_source_files_properties(src/archiver.c
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
     target_compile_options(simplearchiver PUBLIC
         -fno-delete-null-pointer-checks -fno-strict-overflow
-        -fno-strict-aliasing -ftrivial-auto-var-init=zero
+        -fno-strict-aliasing
     )
     target_link_options(simplearchiver PUBLIC
         -fno-delete-null-pointer-checks -fno-strict-overflow
-        -fno-strict-aliasing -ftrivial-auto-var-init=zero
+        -fno-strict-aliasing
     )
+    if(NOT DEFINED DISABLE_FLAGS_FOR_COMPAT)
+        target_compile_options(simplearchiver PUBLIC
+            -ftrivial-auto-var-init=zero
+        )
+        target_link_options(simplearchiver PUBLIC
+            -ftrivial-auto-var-init=zero
+        )
+    endif()
 endif()
 
 add_executable(test_datastructures
-- 
2.49.0