Fix some review comments

raulcd · Jan 21, 2025 · 40711bb · 40711bb
1 parent cc4cea4
commit 40711bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/ci/rtools/BuildAwsCCommon.patch → ci/rtools/awc_c_common_ep.patch b/ci/rtools/BuildAwsCCommon.patch → ci/rtools/awc_c_common_ep.patch
@@ -23,7 +23,7 @@ index b717bca..5aa8ac9 100644
              list(APPEND AWS_C_FLAGS -Wno-strict-aliasing)
          endif()
 
-+         if(CMAKE_C_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32")
++         if (CMAKE_C_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32")
 +            list(APPEND AWS_C_FLAGS -D__USE_MINGW_ANSI_STDIO=1 -Wno-unused-local-typedefs)
 +        endif()
 +

diff --git a/ci/scripts/install_cmake.sh b/ci/scripts/install_cmake.sh
@@ -36,11 +36,6 @@ if [ -z ${archs[$arch]} ]; then
 fi
 arch=${archs[$arch]}
 
-declare -A platforms
-platforms=([linux]=linux
-           [macos]=macos
-           [windows]=windows)
-
 version=$1
 prefix=$2
 

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -5045,8 +5045,14 @@ macro(build_awssdk)
   # GH-44950: This is required to build under Rtools40 and we may be able to
   # remove it if/when we no longer need to build under Rtools40
   if(WIN32 AND NOT MSVC)
-    string(APPEND AWS_C_FLAGS " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args")
-    string(APPEND AWS_CXX_FLAGS " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args")
+    string(APPEND
+           AWS_C_FLAGS
+           " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args"
+    )
+    string(APPEND
+           AWS_CXX_FLAGS
+           " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args"
+    )
   endif()
 
   set(AWSSDK_COMMON_CMAKE_ARGS
@@ -5091,7 +5097,7 @@ macro(build_awssdk)
     find_program(PATCH patch REQUIRED)
     # Patch aws_c_common to build under Rtools40
     set(AWS_C_COMMON_PATCH_COMMAND ${PATCH} -p1 -i
-                                   ${CMAKE_SOURCE_DIR}/../ci/rtools/BuildAwsCCommon.patch)
+                                   ${CMAKE_SOURCE_DIR}/../ci/rtools/aws_c_common_ep.patch)
     message(STATUS "Hello ${AWS_C_COMMON_PATCH_COMMAND}")
     # aws_c_io_ep to build under Rtools40
     set(AWS_C_IO_PATCH_COMMAND ${PATCH} -p1 -i