Compiler fixes for MacOS/gcc-20; nlhomann json update (#286)

closes #285

---------

Co-authored-by: Knute Lingaard <klingaard@mips.com>

Author: klingaard

.github/workflows/macos-build.yml

@@ -12,8 +12,8 @@ jobs:
     strategy:
       # Strategy is a matrix of debug and release builds/regression
       matrix:
-        os: [macos-latest]
-        BUILD_TYPE: [Debug]
+        os: [macos-15]
+        BUILD_TYPE: [Release]
         COMPILER: [clang]
 
     name: MacOS-${{ matrix.BUILD_TYPE }}-${{matrix.COMPILER}}
@@ -40,19 +40,12 @@ jobs:
           path: map
           ref: map_v2.0.21
 
-      # Setup Conda and build environment
+      # Setup build environment
       - name: Grab Python v3.8
         uses: actions/setup-python@v3
         with:
           python-version: 3.8
 
-      # Cache the conda dependencies to
-      - name: Cache conda deps
-        uses: actions/cache@v3
-        with:
-          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('.github/workflows/conda/macos_env.yml') }}
-          path: /usr/share/miniconda/envs/riscv_perf_model # Default path for conda
-
       # Setup CCache to cache builds
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -62,13 +55,10 @@ jobs:
             ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-ccache-master
             ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-ccache
 
-      - name: Setup Conda Environment
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          channels: conda-forge,defaults
-          channel-priority: true
-          activate-environment: riscv_perf_model
-          environment-file: .github/workflows/conda/macos_env.yml
+      # Install missing packages to make everything build
+      - name: Install packages needed for sparta/olympia
+        run: |
+          brew install boost bison ccache cmake libyaml rapidjson xz zstd yaml-cpp
 
       # Build
       - name: Build & Regress

CMakeLists.txt

@@ -30,6 +30,7 @@ else()
 endif()
 
 include_directories(${SPARTA_INCLUDE_DIRS})
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 ################################################################################
 # Set up STF library
@@ -43,7 +44,6 @@ endif()
 include(${STF_LIB_BASE}/cmake/stf_linker_setup.cmake)
 setup_stf_linker(false)
 
-
 # Use ccache if installed
 find_program (CCACHE_PROGRAM ccache)
 if (CCACHE_PROGRAM)

core/CMakeLists.txt

@@ -39,7 +39,7 @@ add_library(instgen
 
 find_package(Boost REQUIRED COMPONENTS json)
 
-target_link_libraries(instgen stf zstd mavis Boost::json)
+target_link_libraries(instgen ${STF_LINK_LIBS} mavis Boost::json)
 
 get_property(SPARTA_INCLUDE_PROP TARGET SPARTA::sparta PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 target_include_directories(core SYSTEM PRIVATE ${SPARTA_INCLUDE_PROP})