Skip to content

Commit 167b51c

Browse files
authored
Merge pull request bemanproject#70 from steve-downey/normalize
R7 and 8 of the paper and fixes to optional after wording and LEWG reviews.
2 parents 1c4803f + 1383086 commit 167b51c

25 files changed

+5237
-1648
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: CI Tests
22
on:
3+
workflow_dispatch:
34
push:
45
branches: [main]
56
pull_request:

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: pre-commit
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
push:
67
branches: [main]

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ $(_build_path)/CMakeCache.txt: | $(_build_path) .gitmodules
5959
-rm compile_commands.json
6060
ln -s $(_build_path)/compile_commands.json
6161

62+
TARGET:=all
6263
compile: $(_build_path)/CMakeCache.txt ## Compile the project
6364
cmake --build $(_build_path) --config $(CONFIG) --target all -- -k 0
6465

@@ -91,6 +92,9 @@ env:
9192
papers:
9293
$(MAKE) -C papers/P2988 papers
9394

95+
.DEFAULT: $(_build_path)/CMakeCache.txt ## Other targets passed through to cmake
96+
cmake --build $(_build_path) --config $(CONFIG) --target $@ -- -k 0
97+
9498
PYEXECPATH ?= $(shell which python3.12 || which python3.11 || which python3.10 || which python3.9 || which python3.8 || which python3.7 || which python3)
9599
PYTHON ?= $(shell basename $(PYEXECPATH))
96100
VENV := .venv
@@ -167,4 +171,4 @@ coverage: venv
167171
# Help target
168172
.PHONY: help
169173
help: ## Show this help.
170-
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
174+
@awk 'BEGIN {FS = ":.*?## "} /^[.a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort

etc/clang-20-toolchain.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
include_guard(GLOBAL)
2+
3+
set(CMAKE_C_COMPILER clang-20)
4+
set(CMAKE_CXX_COMPILER clang++-20)
5+
6+
include("${CMAKE_CURRENT_LIST_DIR}/clang-flags.cmake")

etc/gcc-14-toolchain.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/gcc-flags.cmake")
55
set(CMAKE_C_COMPILER gcc-14)
66
set(CMAKE_CXX_COMPILER g++-14)
77
set(GCOV_EXECUTABLE "gcov-14" CACHE STRING "GCOV executable" FORCE)
8+
9+
set(CMAKE_CXX_FLAGS_ASAN
10+
"${CMAKE_CXX_FLAGS_ASAN} -Wno-maybe-uninitialized"
11+
CACHE STRING
12+
"C++ ASAN Flags"
13+
FORCE
14+
)

etc/gcc-15-toolchain.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/gcc-flags.cmake")
44

55
set(CMAKE_C_COMPILER gcc-15)
66
set(CMAKE_CXX_COMPILER g++-15)
7+
8+
set(CMAKE_CXX_FLAGS_ASAN
9+
"${CMAKE_CXX_FLAGS_ASAN} -Wno-maybe-uninitialized"
10+
CACHE STRING
11+
"C++ ASAN Flags"
12+
FORCE
13+
)

etc/gcc-flags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set(CMAKE_CXX_FLAGS_TSAN
2929
FORCE
3030
)
3131
set(CMAKE_CXX_FLAGS_ASAN
32-
"-O3 -g -DNDEBUG -fsanitize=undefined"
32+
"-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
3333
CACHE STRING
3434
"C++ ASAN Flags"
3535
FORCE

0 commit comments

Comments
 (0)