From 3c1e12aa1daed742965cf5e51444c6d6844500e7 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Mon, 16 May 2022 19:39:52 -0400 Subject: [PATCH 1/2] Allow override of prefix-map build flag By placing it before user supplied flags from the environment variables. --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57bf01b9af2..65c14bf5deb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,8 @@ configure_file( ${CMAKE_BINARY_DIR}/git_revision.h ) +# Custom flags that we'll put in front to allow override from ENV +set(PREFIX_FLAGS_COMMON "") set(FLAGS_COMMON "-D__USE_LARGEFILE64 -pthread") set(supports32bit true) set(x86ish false) @@ -71,18 +73,18 @@ configure_file(src/preload/rr_page.ld.in src/preload/rr_page.ld @ONLY) include(CheckCCompilerFlag) CHECK_C_COMPILER_FLAG("-fmacro-prefix-map=foo=bar" SUPPORTS_MACRO_PREFIX_MAP) if (SUPPORTS_MACRO_PREFIX_MAP) - set(FLAGS_COMMON "${FLAGS_COMMON} -fmacro-prefix-map=${CMAKE_SOURCE_DIR}/=") + set(PREFIX_FLAGS_COMMON "${PREFIX_FLAGS_COMMON} -fmacro-prefix-map=${CMAKE_SOURCE_DIR}/=") endif() -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes -std=gnu11") +set(CMAKE_C_FLAGS "${PREFIX_FLAGS_COMMON} ${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes -std=gnu11") # Define __STDC_LIMIT_MACROS so |#include | works as expected. # Define __STDC_FORMAT_MACROS so |#include | works as expected. include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-std=c++14" SUPPORTS_CXX14) if (SUPPORTS_CXX14) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14") + set(CMAKE_CXX_FLAGS "${PREFIX_FLAGS_COMMON} ${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11") + set(CMAKE_CXX_FLAGS "${PREFIX_FLAGS_COMMON} ${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11") endif() # We support three build types: From 5b8f988a195bee1c59c8a6db7537f4d425cf2711 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sat, 18 Jun 2022 16:16:22 -0400 Subject: [PATCH 2/2] Hack to check CI --- .buildkite/lib/generate.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/lib/generate.jl b/.buildkite/lib/generate.jl index 9e0c4aba4bd..370ebec637e 100644 --- a/.buildkite/lib/generate.jl +++ b/.buildkite/lib/generate.jl @@ -27,6 +27,7 @@ function generate(platform::Platform) echo "--- Build" make --output-sync -j\$\${JULIA_CPU_THREADS:?} + bin/rr --log all:info bin/simple echo "--- Test" mkdir -p Testing/Temporary