Use "brew --prefix" to detect HomeBrew prefix (#1095)

Should hopefully work properly on Intel macs now.
bmad-sim · Jul 30, 2024 · 1449297 · 1449297
1 parent e3e8beb
commit 1449297
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/util/Master.cmake b/util/Master.cmake
@@ -338,9 +338,10 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT $ENV{ACC_CONDA_BUILD} MATCHES
     endif()
   endif()
   if (DO_BREW)
-    # Assuming an ARM mac here, path is different for an x86 Mac
-    set(ACC_INC_DIRS ${ACC_INC_DIRS} /opt/homebrew/include /opt/homebrew/opt/readline/include)
-    set(ACC_LIB_DIRS ${ACC_LIB_DIRS} /opt/homebrew/lib /opt/homebrew/opt/readline/lib)
+    execute_process(COMMAND "brew" "--prefix" OUTPUT_VARIABLE HOMEBREW_PREFIX)
+    string(STRIP "${HOMEBREW_PREFIX}" HOMEBREW_PREFIX)
+    set(ACC_INC_DIRS ${ACC_INC_DIRS} "${HOMEBREW_PREFIX}/include" "${HOMEBREW_PREFIX}/opt/readline/include")
+    set(ACC_LIB_DIRS ${ACC_LIB_DIRS} "${HOMEBREW_PREFIX}/lib" "${HOMEBREW_PREFIX}/opt/readline/lib")
   elseif (DO_PORT)
     set(ACC_INC_DIRS ${ACC_INC_DIRS} /opt/local/include)
     set(ACC_LIB_DIRS ${ACC_LIB_DIRS} /opt/local/lib)

diff --git a/util/dist_source_me b/util/dist_source_me
@@ -414,7 +414,7 @@ func_macos_gcc () {
 	    fi
 	elif [ "$brew" ]
 	then
-	    p=/opt/homebrew/bin/gcc-
+	    p=$(brew --prefix)/bin/gcc-
 	    v=0
 	    for g in $p[0-9]*
 	    do