Disable debug symbols and frame pointer for macos

This causes some versions of clang to crash
Revert "Use homebrew clang for packaging for macos"
2024-08-08 11:51:13 -07:00 · 2024-08-08 11:50:13 -07:00 · 2024-08-08 11:26:49 -07:00
2 changed files with 8 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.18)
 project(
  conflict-set
-  VERSION 0.0.10
+  VERSION 0.0.11
  DESCRIPTION
    "A data structure for optimistic concurrency control on ranges of bitwise-lexicographically-ordered keys."
  HOMEPAGE_URL "https://git.weaselab.dev/weaselab/conflict-set"
@@ -31,14 +31,12 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
                                               "MinSizeRel" "RelWithDebInfo")
 endif()

-add_compile_options(
-  -fdata-sections
-  -ffunction-sections
-  -Wswitch-enum
-  -Werror=switch-enum
-  -fPIC
-  -g
-  -fno-omit-frame-pointer)
+add_compile_options(-fdata-sections -ffunction-sections -Wswitch-enum
+                    -Werror=switch-enum -fPIC)
+if(NOT APPLE)
+  # This causes some versions of clang to crash on macos
+  add_compile_options(-g -fno-omit-frame-pointer)
+endif()

 set(full_relro_flags "-pie;LINKER:-z,relro,-z,now,-z,noexecstack")
 cmake_push_check_state()
--- a/package_macos.sh
+++ b/package_macos.sh
@@ -8,7 +8,7 @@ SRC_DIR="${0%/*}"
 BUILD_ARM="$(mktemp -d -t conflict-set-arm)"
 BUILD_X86="$(mktemp -d -t conflict-set-x86)"

-cmake_args=(-DCMAKE_CXX_FLAGS=-DNVALGRIND -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ -DCPACK_PACKAGING_INSTALL_PREFIX=/usr/local)
+cmake_args=(-DCMAKE_CXX_FLAGS=-DNVALGRIND -DCPACK_PACKAGING_INSTALL_PREFIX=/usr/local)

 cmake -S"$SRC_DIR" -B"$BUILD_ARM" -DCMAKE_OSX_ARCHITECTURES=arm64 "${cmake_args[@]}"
 cmake --build "$BUILD_ARM" --target conflict-set --target conflict-set-static
Author	SHA1	Message	Date
Andrew Noyes	84c6a2bfc2	Disable debug symbols and frame pointer for macos All checks were successful Tests / Clang total: 1420, passed: 1420 Details Clang \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / Debug total: 1418, passed: 1418 Details Tests / SIMD fallback total: 1420, passed: 1420 Details Tests / Release [gcc] total: 1420, passed: 1420 Details GNU C Compiler (gcc) \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / Release [gcc,aarch64] total: 1057, passed: 1057 Details Tests / Coverage total: 1067, passed: 1067 Details Code Coverage #### Project Overview No changes detected, that affect the code coverage. * Line Coverage: 99.34% (1817/1829) * Branch Coverage: 67.49% (1503/2227) * Complexity Density: 0.00 * Lines of Code: 1829 #### Quality Gates Summary Output truncated. Details weaselab/conflict-set/pipeline/head This commit looks good Details This causes some versions of clang to crash	2024-08-08 11:51:13 -07:00
Andrew Noyes	b5772a6aa0	Revert "Use homebrew clang for packaging for macos" This reverts commit `c20c08f112`.	2024-08-08 11:50:13 -07:00
Andrew Noyes	e6c39981b9	Bump version All checks were successful Tests / Clang total: 1420, passed: 1420 Details Clang \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / Debug total: 1418, passed: 1418 Details Tests / SIMD fallback total: 1420, passed: 1420 Details Tests / Release [gcc] total: 1420, passed: 1420 Details GNU C Compiler (gcc) \|Total\|New\|Outstanding\|Fixed\|Trend \|:-:\|:-:\|:-:\|:-:\|:-: \|0\|0\|0\|0\|:clap: Details Tests / Release [gcc,aarch64] total: 1057, passed: 1057 Details Tests / Coverage total: 1067, passed: 1067 Details Code Coverage #### Project Overview No changes detected, that affect the code coverage. * Line Coverage: 99.34% (1817/1829) * Branch Coverage: 67.49% (1503/2227) * Complexity Density: 0.00 * Lines of Code: 1829 #### Quality Gates Summary Output truncated. Details weaselab/conflict-set/pipeline/head This commit looks good Details	2024-08-08 11:26:49 -07:00