From 8456abd58a61f7ea203e79af79178ab5d5210c50 Mon Sep 17 00:00:00 2001 From: Luke Shingles Date: Mon, 11 Nov 2024 22:13:34 +0000 Subject: [PATCH] Update Makefile --- .github/workflows/cislowtestmode.yml | 10 +++++----- Makefile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cislowtestmode.yml b/.github/workflows/cislowtestmode.yml index 055297cdb..7ee441f3b 100644 --- a/.github/workflows/cislowtestmode.yml +++ b/.github/workflows/cislowtestmode.yml @@ -7,11 +7,11 @@ on: - classic* workflow_dispatch: -concurrency: - # Use github.run_id on main or develop branch (unlimited concurrency) - # Use github.ref otherwise, so that it's unique per branch or PR - group: ${{ github.workflow }}-${{ github.ref_protected && github.run_id || github.ref }} - cancel-in-progress: false +# concurrency: +# # Use github.run_id on main or develop branch (unlimited concurrency) +# # Use github.ref otherwise, so that it's unique per branch or PR +# group: ${{ github.workflow }}-${{ github.ref_protected && github.run_id || github.ref }} +# cancel-in-progress: false jobs: citestmode: diff --git a/Makefile b/Makefile index f1089318c..eb0e173a5 100644 --- a/Makefile +++ b/Makefile @@ -36,11 +36,11 @@ else ifneq '' '$(findstring g++,$(COMPILER_VERSION))' COMPILER_NAME := GCC CXXFLAGS += -flto=auto # std::stacktrace is available in GCC 14 and later - ifeq ($(shell expr $(COMPILER_VERSION_NUMBER_MAJOR) \>= 14),1) + ifeq ($(shell expr $(COMPILER_VERSION_NUMBER_MAJOR) \>= 14),1) # CXXFLAGS += -rdynamic # CXXFLAGS += -DENABLE_STACKTRACE=true # LDFLAGS += -lstdc++exp - endif + endif else ifneq '' '$(findstring nvc++,$(COMPILER_VERSION))' COMPILER_NAME := NVHPC else