Push a known-bad setup to fail

apache · Feb 27, 2024 · 19461ca · 19461ca
1 parent 87fa3b7
commit 19461ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
@@ -104,7 +104,6 @@ function(arrow_create_merged_static_lib output_target)
 
     # check in the obvious places first to find Apple's libtool
     find_program(LIBTOOL_MACOS libtool
-                 PATHS /usr/bin /Library/Developer/CommandLineTools/usr/bin
                  NO_DEFAULT_PATH)
 
     # if it's not found in obvious places, check on the standard path

diff --git a/dev/tasks/r/github.macos-linux.local.yml b/dev/tasks/r/github.macos-linux.local.yml
@@ -46,9 +46,6 @@ jobs:
           # brew install sccache
           # remove cmake so that we can test our cmake downloading abilities
           brew uninstall cmake
-          # install GNU libtool to ensure that we simulate the CRAN macOS builders
-          brew install libtool
-          echo "/usr/local/opt/libtool/libexec/gnubin" >> $GITHUB_PATH
       - name: Configure dependencies (linux)
         if: contains(matrix.os, 'ubuntu')
         run: |
@@ -61,6 +58,11 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
+      - name: Add R.framework/Resources/bin to the path
+        run: |
+          # 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
+          echo "/Library/Frameworks/R.framework/Resources/bin" >> $GITHUB_PATH
       - name: Install dependencies
         uses: r-lib/actions/setup-r-dependencies@v2
         with: