From 5c1cb90d6a1a64ce8e9bcff2b24e41670e206a03 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 09:57:55 -0500 Subject: [PATCH 01/15] add cran's strict flags --- dev/tasks/r/github.macos-linux.local.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tasks/r/github.macos-linux.local.yml b/dev/tasks/r/github.macos-linux.local.yml index b221e8c5d8d..2ec1d2dae24 100644 --- a/dev/tasks/r/github.macos-linux.local.yml +++ b/dev/tasks/r/github.macos-linux.local.yml @@ -90,6 +90,7 @@ jobs: run: | sccache --start-server || echo 'sccache not found' cd arrow/r + export CXXFLAGS="-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion" R CMD INSTALL . --install-tests - name: Run the tests run: R -e 'if(tools::testInstalledPackage("arrow") != 0L) stop("There was a test failure.")' From 15f54c1b9d948d7362d44663efe1ea42cc2d0862 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 10:25:26 -0500 Subject: [PATCH 02/15] a separate, more CRAN-like job for macos --- dev/tasks/r/github.macos.cran.yml | 92 +++++++++++++++++++++++++++++++ dev/tasks/tasks.yml | 5 ++ 2 files changed, 97 insertions(+) create mode 100644 dev/tasks/r/github.macos.cran.yml diff --git a/dev/tasks/r/github.macos.cran.yml b/dev/tasks/r/github.macos.cran.yml new file mode 100644 index 00000000000..d545041484d --- /dev/null +++ b/dev/tasks/r/github.macos.cran.yml @@ -0,0 +1,92 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{% import 'macros.jinja' as macros with context %} + +{{ macros.github_header() }} + +jobs: + macos-cran: + name: "macOS similar to CRAN" + runs-on: macOS-latest + {% if env is defined %} + env: + {% for key, value in env.items() %} + {{ key }}: "{{ value }}" + {% endfor %} + {% endif %} + strategy: + fail-fast: false + + steps: + {{ macros.github_checkout_arrow()|indent }} + + - name: Configure dependencies (macos) + run: | + brew install openssl + # disable sccache on macos as it times out for unknown reasons + # see GH-33721 + # brew install sccache + # remove cmake so that we can test our cmake downloading abilities + brew uninstall cmake + - uses: r-lib/actions/setup-r@v2 + with: + use-public-rspm: true + # CRAN builders have the entire bin here added to the path. This sometimes + # includes things like GNU libtool which name-collide with what we expect + - name: Add R.framework/Resources/bin to the path + run: echo "/Library/Frameworks/R.framework/Resources/bin" >> $GITHUB_PATH + - name : Check whether libtool in R is used + run: | + if [ "$(which libtool)" != "/Library/Frameworks/R.framework/Resources/bin/libtool" ]; then + echo "libtool provided by R isn't found: $(which libtool)" + exit 1 + fi + - name: Install dependencies + uses: r-lib/actions/setup-r-dependencies@v2 + with: + cache: false # cache does not work on across branches + working-directory: arrow/r + extra-packages: | + any::rcmdcheck + any::sys + - name: Install + env: + _R_CHECK_CRAN_INCOMING_: false + CXXFLAGS: "-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion" + # ARROW_USE_PKG_CONFIG: false + # FORCE_BUNDLED_BUILD: true + # LIBARROW_MINIMAL: false + # ARROW_R_DEV: TRUE + # LIBARROW_BINARY: false + {{ macros.github_set_sccache_envvars()|indent(8)}} + run: | + sccache --start-server || echo 'sccache not found' + cd arrow/r + export + R CMD INSTALL . --install-tests + - name: Run the tests + run: R -e 'if(tools::testInstalledPackage("arrow") != 0L) stop("There was a test failure.")' + - name: Dump test logs + run: cat arrow-tests/testthat.Rout* + if: failure() + - name: Save the test output + uses: actions/upload-artifact@v2 + with: + name: test-output + path: arrow-tests/testthat.Rout* + if: always() diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index a9da7eb2889..5d1da927e4f 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1319,6 +1319,11 @@ tasks: params: MATRIX: {{ "${{ matrix.r_image }}" }} + test-r-macos-as-cran: + ci: github + template: r/github.macos.cran.yml + + test-r-arrow-backwards-compatibility: ci: github template: r/github.linux.arrow.version.back.compat.yml From 5a26b3ce2da9c46c862f86b3ca48bc44ded9f64b Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 10:40:39 -0500 Subject: [PATCH 03/15] Remove environment setting --- dev/tasks/r/github.macos.cran.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dev/tasks/r/github.macos.cran.yml b/dev/tasks/r/github.macos.cran.yml index d545041484d..0d987a1c8a9 100644 --- a/dev/tasks/r/github.macos.cran.yml +++ b/dev/tasks/r/github.macos.cran.yml @@ -23,12 +23,6 @@ jobs: macos-cran: name: "macOS similar to CRAN" runs-on: macOS-latest - {% if env is defined %} - env: - {% for key, value in env.items() %} - {{ key }}: "{{ value }}" - {% endfor %} - {% endif %} strategy: fail-fast: false @@ -73,11 +67,9 @@ jobs: # LIBARROW_MINIMAL: false # ARROW_R_DEV: TRUE # LIBARROW_BINARY: false - {{ macros.github_set_sccache_envvars()|indent(8)}} run: | sccache --start-server || echo 'sccache not found' cd arrow/r - export R CMD INSTALL . --install-tests - name: Run the tests run: R -e 'if(tools::testInstalledPackage("arrow") != 0L) stop("There was a test failure.")' From 1e22bf38372c97efff4f781e69edaf3776aaacbc Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 10:48:30 -0500 Subject: [PATCH 04/15] epxlicit not_cran --- dev/tasks/r/github.macos.cran.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tasks/r/github.macos.cran.yml b/dev/tasks/r/github.macos.cran.yml index 0d987a1c8a9..48b4023ecf4 100644 --- a/dev/tasks/r/github.macos.cran.yml +++ b/dev/tasks/r/github.macos.cran.yml @@ -62,6 +62,7 @@ jobs: env: _R_CHECK_CRAN_INCOMING_: false CXXFLAGS: "-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion" + NOT_CRAN: false # ARROW_USE_PKG_CONFIG: false # FORCE_BUNDLED_BUILD: true # LIBARROW_MINIMAL: false From 5756fe02d895fae59d756591997af6dbe9cda42a Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 13:57:02 -0500 Subject: [PATCH 05/15] Allow aws sdk to build on clang --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index bc3a3a2249d..a13b12422eb 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4965,8 +4965,14 @@ macro(build_awssdk) set(AWSSDK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/awssdk_ep-install") set(AWSSDK_INCLUDE_DIR "${AWSSDK_PREFIX}/include") + set(AWS_EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}) + if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL + "Clang") + string(REPLACE "-Wconversion" "-Wconversion -Wno-error=shorten-64-to-32" AWS_EP_COMMON_CMAKE_ARGS "${AWS_EP_COMMON_CMAKE_ARGS}") + endif() + set(AWSSDK_COMMON_CMAKE_ARGS - ${EP_COMMON_CMAKE_ARGS} + ${AWS_EP_COMMON_CMAKE_ARGS} -DCPP_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_INSTALL_PREFIX=${AWSSDK_PREFIX} -DCMAKE_PREFIX_PATH=${AWSSDK_PREFIX} From 37c6c60114135d279fc9153c986e4aca5b469728 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 14:04:14 -0500 Subject: [PATCH 06/15] A comment clarifying --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index a13b12422eb..c019e85e28e 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4965,10 +4965,12 @@ macro(build_awssdk) set(AWSSDK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/awssdk_ep-install") set(AWSSDK_INCLUDE_DIR "${AWSSDK_PREFIX}/include") - set(AWS_EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}) + # The AWS SDK has a few warnings around shortening lengths + set(AWS_EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}) if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL - "Clang") - string(REPLACE "-Wconversion" "-Wconversion -Wno-error=shorten-64-to-32" AWS_EP_COMMON_CMAKE_ARGS "${AWS_EP_COMMON_CMAKE_ARGS}") + "Clang") + string(REPLACE "-Wconversion" "-Wconversion -Wno-error=shorten-64-to-32" + AWS_EP_COMMON_CMAKE_ARGS "${AWS_EP_COMMON_CMAKE_ARGS}") endif() set(AWSSDK_COMMON_CMAKE_ARGS From f98ef4421a4adeb33d2fd022976e21809470df3f Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 14:09:39 -0500 Subject: [PATCH 07/15] lint --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index c019e85e28e..b52faafabd4 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4968,7 +4968,7 @@ macro(build_awssdk) # The AWS SDK has a few warnings around shortening lengths set(AWS_EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}) if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL - "Clang") + "Clang") string(REPLACE "-Wconversion" "-Wconversion -Wno-error=shorten-64-to-32" AWS_EP_COMMON_CMAKE_ARGS "${AWS_EP_COMMON_CMAKE_ARGS}") endif() From cbaddef01e39a80c9ae4e42dac426b9b6e3daa21 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 14:23:58 -0500 Subject: [PATCH 08/15] Remove errant changes --- dev/tasks/r/github.macos-linux.local.yml | 1 - dev/tasks/r/github.macos.cran.yml | 5 ----- 2 files changed, 6 deletions(-) diff --git a/dev/tasks/r/github.macos-linux.local.yml b/dev/tasks/r/github.macos-linux.local.yml index 2ec1d2dae24..b221e8c5d8d 100644 --- a/dev/tasks/r/github.macos-linux.local.yml +++ b/dev/tasks/r/github.macos-linux.local.yml @@ -90,7 +90,6 @@ jobs: run: | sccache --start-server || echo 'sccache not found' cd arrow/r - export CXXFLAGS="-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion" R CMD INSTALL . --install-tests - name: Run the tests run: R -e 'if(tools::testInstalledPackage("arrow") != 0L) stop("There was a test failure.")' diff --git a/dev/tasks/r/github.macos.cran.yml b/dev/tasks/r/github.macos.cran.yml index 48b4023ecf4..73cb54356d1 100644 --- a/dev/tasks/r/github.macos.cran.yml +++ b/dev/tasks/r/github.macos.cran.yml @@ -63,11 +63,6 @@ jobs: _R_CHECK_CRAN_INCOMING_: false CXXFLAGS: "-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion" NOT_CRAN: false - # ARROW_USE_PKG_CONFIG: false - # FORCE_BUNDLED_BUILD: true - # LIBARROW_MINIMAL: false - # ARROW_R_DEV: TRUE - # LIBARROW_BINARY: false run: | sccache --start-server || echo 'sccache not found' cd arrow/r From a96647d6feaad44b44b1b36de6980954ea90ae82 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 17:19:36 -0500 Subject: [PATCH 09/15] A few more flags --- dev/tasks/r/github.macos.cran.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tasks/r/github.macos.cran.yml b/dev/tasks/r/github.macos.cran.yml index 73cb54356d1..33965988e21 100644 --- a/dev/tasks/r/github.macos.cran.yml +++ b/dev/tasks/r/github.macos.cran.yml @@ -61,6 +61,8 @@ jobs: - name: Install env: _R_CHECK_CRAN_INCOMING_: false + CXX: "clang++ -mmacos-version-min=14.6" + CFLAGS: "-falign-functions=8 -g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion -Wstrict-prototypes" CXXFLAGS: "-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion" NOT_CRAN: false run: | From 5e80a72d0329118307108663436e25e963c880f1 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 17:20:07 -0500 Subject: [PATCH 10/15] Use flags approach instead --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index b52faafabd4..b0a5775360f 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4966,12 +4966,24 @@ macro(build_awssdk) set(AWSSDK_INCLUDE_DIR "${AWSSDK_PREFIX}/include") # The AWS SDK has a few warnings around shortening lengths - set(AWS_EP_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}) + set(AWS_C_FLAGS "${EP_C_FLAGS}") + set(AWS_CXX_FLAGS "${EP_CXX_FLAGS}") if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - string(REPLACE "-Wconversion" "-Wconversion -Wno-error=shorten-64-to-32" - AWS_EP_COMMON_CMAKE_ARGS "${AWS_EP_COMMON_CMAKE_ARGS}") - endif() + # Negate warnings that AWS SDK cannot build under + string(APPEND + AWS_C_FLAGS + " -Wno-error=shorten-64-to-32") + string(APPEND + AWS_CXX_FLAGS + " -Wno-error=shorten-64-to-32") + endif() + + set(AWS_EP_COMMON_CMAKE_ARGS + "${EP_COMMON_CMAKE_ARGS}" + "-DCMAKE_C_FLAGS=${AWS_C_FLAGS}" + "-DCMAKE_CXX_FLAGS=${AWS_CXX_FLAGS}" + ) set(AWSSDK_COMMON_CMAKE_ARGS ${AWS_EP_COMMON_CMAKE_ARGS} From 30149f0ac8964227992f06b983aafda4ba7b00ce Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 17:25:33 -0500 Subject: [PATCH 11/15] ugh linting --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 25 ++++++++------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index b0a5775360f..978f1a118a0 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4966,24 +4966,17 @@ macro(build_awssdk) set(AWSSDK_INCLUDE_DIR "${AWSSDK_PREFIX}/include") # The AWS SDK has a few warnings around shortening lengths - set(AWS_C_FLAGS "${EP_C_FLAGS}") - set(AWS_CXX_FLAGS "${EP_CXX_FLAGS}") + set(AWS_C_FLAGS "${EP_C_FLAGS}") + set(AWS_CXX_FLAGS "${EP_CXX_FLAGS}") if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - # Negate warnings that AWS SDK cannot build under - string(APPEND - AWS_C_FLAGS - " -Wno-error=shorten-64-to-32") - string(APPEND - AWS_CXX_FLAGS - " -Wno-error=shorten-64-to-32") - endif() - - set(AWS_EP_COMMON_CMAKE_ARGS - "${EP_COMMON_CMAKE_ARGS}" - "-DCMAKE_C_FLAGS=${AWS_C_FLAGS}" - "-DCMAKE_CXX_FLAGS=${AWS_CXX_FLAGS}" - ) + # Negate warnings that AWS SDK cannot build under + string(APPEND AWS_C_FLAGS " -Wno-error=shorten-64-to-32") + string(APPEND AWS_CXX_FLAGS " -Wno-error=shorten-64-to-32") + endif() + + set(AWS_EP_COMMON_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" "-DCMAKE_C_FLAGS=${AWS_C_FLAGS}" + "-DCMAKE_CXX_FLAGS=${AWS_CXX_FLAGS}") set(AWSSDK_COMMON_CMAKE_ARGS ${AWS_EP_COMMON_CMAKE_ARGS} From c13ba9b6773f55cc8d342e2449b97f8a08e3a128 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 18:00:52 -0500 Subject: [PATCH 12/15] last lint? --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 978f1a118a0..6f6907bfde6 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4970,9 +4970,9 @@ macro(build_awssdk) set(AWS_CXX_FLAGS "${EP_CXX_FLAGS}") if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - # Negate warnings that AWS SDK cannot build under - string(APPEND AWS_C_FLAGS " -Wno-error=shorten-64-to-32") - string(APPEND AWS_CXX_FLAGS " -Wno-error=shorten-64-to-32") + # Negate warnings that AWS SDK cannot build under + string(APPEND AWS_C_FLAGS " -Wno-error=shorten-64-to-32") + string(APPEND AWS_CXX_FLAGS " -Wno-error=shorten-64-to-32") endif() set(AWS_EP_COMMON_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" "-DCMAKE_C_FLAGS=${AWS_C_FLAGS}" From 8df5b134996af75a0cf45cb5958e6f41e707614e Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 20:49:46 -0500 Subject: [PATCH 13/15] Update dev/tasks/tasks.yml Co-authored-by: Sutou Kouhei --- dev/tasks/tasks.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 5d1da927e4f..fe02fe9ce68 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1323,7 +1323,6 @@ tasks: ci: github template: r/github.macos.cran.yml - test-r-arrow-backwards-compatibility: ci: github template: r/github.linux.arrow.version.back.compat.yml From d8fef6b18d31885cbe6e1864336f17937e98c20f Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 20:52:32 -0500 Subject: [PATCH 14/15] Simplify --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 6f6907bfde6..c20a6b0cb3b 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4974,12 +4974,11 @@ macro(build_awssdk) string(APPEND AWS_C_FLAGS " -Wno-error=shorten-64-to-32") string(APPEND AWS_CXX_FLAGS " -Wno-error=shorten-64-to-32") endif() - - set(AWS_EP_COMMON_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" "-DCMAKE_C_FLAGS=${AWS_C_FLAGS}" - "-DCMAKE_CXX_FLAGS=${AWS_CXX_FLAGS}") - + set(AWSSDK_COMMON_CMAKE_ARGS - ${AWS_EP_COMMON_CMAKE_ARGS} + ${EP_COMMON_CMAKE_ARGS} + -DCMAKE_C_FLAGS=${AWS_C_FLAGS} + -DCMAKE_CXX_FLAGS=${AWS_CXX_FLAGS} -DCPP_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_INSTALL_PREFIX=${AWSSDK_PREFIX} -DCMAKE_PREFIX_PATH=${AWSSDK_PREFIX} From 625a84728613ef068524bfbc40fb35679ad693c4 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sat, 17 Aug 2024 20:56:22 -0500 Subject: [PATCH 15/15] another lint --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index c20a6b0cb3b..63e2c036c9a 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -4974,7 +4974,7 @@ macro(build_awssdk) string(APPEND AWS_C_FLAGS " -Wno-error=shorten-64-to-32") string(APPEND AWS_CXX_FLAGS " -Wno-error=shorten-64-to-32") endif() - + set(AWSSDK_COMMON_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} -DCMAKE_C_FLAGS=${AWS_C_FLAGS}