Support default lib paths for m1 macs and MacPorts installations

vlang · Oct 24, 2023 · c68ba7b · c68ba7b
1 parent 7d5ee50
commit c68ba7b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/fft/_cflags.c.v b/fft/_cflags.c.v
@@ -2,11 +2,13 @@ module fft
 
 #flag linux -I/usr/local/include
 #flag linux -L/usr/lib -L/usr/local/lib
-#flag darwin -I/usr/local/include
 #flag freebsd -I/usr/local/include
 #flag freebsd -L/usr/local/lib
 #flag openbsd -I/usr/local/include
 #flag openbsd -L/usr/local/lib
+// Intel, M1 brew, and MacPorts
+#flag darwin -I/usr/local/include -I/opt/homebrew/include -L/opt/local/lib
+#flag darwin -L/usr/local/lib -L/opt/homebrew/lib -L/opt/local/lib
 #flag -I@VMODROOT
 
 #flag @VMODROOT/pocket-fft/f32.o

diff --git a/inout/h5/_cflags.c.v b/inout/h5/_cflags.c.v
@@ -2,12 +2,13 @@ module h5
 
 #flag linux -I/usr/include/hdf5/serial/ -I/usr/local/include
 #flag linux -L/usr/lib -L/usr/lib/x86_64-linux-gnu/hdf5/serial/ -L/usr/local/lib -pthread
-#flag darwin -I/usr/local/include
-#flag darwin -L/usr/local/lib
 #flag freebsd -I/usr/local/include
 #flag freebsd -L/usr/local/lib
 #flag openbsd -I/usr/local/include
 #flag openbsd -L/usr/local/lib
+// Intel, M1 brew, and MacPorts
+#flag darwin -I/usr/local/include -I/opt/homebrew/include -L/opt/local/lib
+#flag darwin -L/usr/local/lib -L/opt/homebrew/lib -L/opt/local/lib
 #flag -I@VMODROOT
 #flag -lhdf5 -lhdf5_hl
 

diff --git a/mpi/_cflags.c.v b/mpi/_cflags.c.v
@@ -2,12 +2,14 @@ module mpi
 
 #flag linux -I/usr/lib/x86_64-linux-gnu/openmpi/include -I/usr/include/x86_64-linux-gnu/mpi -pthread
 #flag linux -pthread -L/usr/lib/x86_64-linux-gnu/openmpi/lib
-#flag darwin -I/usr/local/Cellar/open-mpi/4.1.5/include -I/usr/local/include
-#flag darwin -L/usr/local/opt/libevent/lib -L/usr/local/Cellar/open-mpi/4.1.5/lib -L/usr/local/lib
-#flag freebsd -I/usr/local/Cellar/open-mpi/4.1.5/include -I/usr/local/include
-#flag freebsd -L/usr/local/opt/libevent/lib -L/usr/local/Cellar/open-mpi/4.1.5/lib -L/usr/local/lib
-#flag openbsd -I/usr/local/Cellar/open-mpi/4.1.5/include -I/usr/local/include
-#flag openbsd -L/usr/local/opt/libevent/lib -L/usr/local/Cellar/open-mpi/4.1.5/lib -L/usr/local/lib
+#flag freebsd -I/usr/local/include
+#flag freebsd -L/usr/local/opt/libevent/lib -L/usr/local/lib
+#flag openbsd -I/usr/local/include
+#flag openbsd -L/usr/local/opt/libevent/lib -L/usr/local/lib
+// Intel, M1 brew, and MacPorts
+#flag darwin -I/usr/local/include -I/opt/homebrew/include -I/opt/local/include
+#flag darwin -L/usr/local/lib -L/opt/homebrew/lib -L/opt/local/lib
+#flag darwin -L/usr/local/opt/libevent/lib -L/opt/homebrew/opt/libevent/lib -L/opt/local/opt/libevent/lib
 #flag -I@VMODROOT
 #flag -lmpi
 

diff --git a/vlas/cflags_d_cblas.v b/vlas/cflags_d_cblas.v
@@ -4,9 +4,10 @@ module vlas
 #flag linux -L/usr/local/lib -L/usr/lib
 #flag windows -O2
 #flag windows -lgfortran
-#flag darwin -I/usr/local/opt/openblas/include
-#flag darwin -L/usr/local/opt/openblas/lib
-#flag darwin -L/usr/local/opt/lapack/lib
+// Intel, M1 brew, and MacPorts
+#flag darwin -I/usr/local/opt/openblas/include -I/opt/homebrew/opt/openblas/include -I/opt/local/opt/openblas/include
+#flag darwin -L/usr/local/opt/openblas/lib -L/opt/homebrew/opt/openblas/lib -L/opt/local/opt/openblas/lib
+#flag darwin -L/usr/local/opt/lapack/lib -L/opt/homebrew/opt/lapack/lib -L/opt/local/opt/lapack/lib
 #flag -I@VMODROOT
 #flag -lopenblas -llapacke
 

diff --git a/vlas/cflags_notd_cblas.v b/vlas/cflags_notd_cblas.v
@@ -4,8 +4,9 @@ module vlas
 #flag linux -L/usr/local/lib -L/usr/lib
 #flag windows -O2
 #flag windows -lgfortran
-#flag darwin -I/usr/local/opt/lapack/include
-#flag darwin -L/usr/local/opt/lapack/lib
+// Intel, M1 brew, and MacPorts
+#flag darwin -I/usr/local/opt/lapack/include -I/opt/homebrew/opt/lapack/include -I/opt/local/opt/lapack/include
+#flag darwin -L/usr/local/opt/lapack/lib -L/opt/homebrew/opt/lapack/lib -L/opt/local/opt/lapack/lib
 #flag -I@VMODROOT
 #flag -llapacke