From 904b61dae947ece614a5a0504a36cf295a42d826 Mon Sep 17 00:00:00 2001
From: Turiiya <34311583+ttytm@users.noreply.github.com>
Date: Sun, 22 Oct 2023 01:18:26 +0200
Subject: [PATCH] Simplify `-l` cflags (#175)

* Simplify `-l` cflags

* Don't flag blas where not intended to use

* Fix lapack path on macOS
---
 inout/h5/_cflags.c.v     | 7 ++-----
 mpi/_cflags.c.v          | 9 +++++----
 vlas/cflags_d_cblas.v    | 7 ++++---
 vlas/cflags_notd_cblas.v | 9 +++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/inout/h5/_cflags.c.v b/inout/h5/_cflags.c.v
index 68d5e5835..6f5a41857 100644
--- a/inout/h5/_cflags.c.v
+++ b/inout/h5/_cflags.c.v
@@ -1,18 +1,15 @@
 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 -lhdf5 -lhdf5_hl
+#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
-
 #flag -I@VMODROOT
-
-#flag -lhdf5
-#flag -lhdf5_hl
+#flag -lhdf5 -lhdf5_hl
 
 #include <hdf5.h>
 #include <hdf5_hl.h>
diff --git a/mpi/_cflags.c.v b/mpi/_cflags.c.v
index 5f5a22569..00bd22ebb 100644
--- a/mpi/_cflags.c.v
+++ b/mpi/_cflags.c.v
@@ -1,13 +1,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 -lmpi
+#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 -lmpi
+#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 -lmpi
+#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 -lmpi
+#flag openbsd -L/usr/local/opt/libevent/lib -L/usr/local/Cellar/open-mpi/4.1.5/lib -L/usr/local/lib
 #flag -I@VMODROOT
+#flag -lmpi
 
 #include <cmpi.h>
diff --git a/vlas/cflags_d_cblas.v b/vlas/cflags_d_cblas.v
index ae18e60f2..9b72c3d76 100644
--- a/vlas/cflags_d_cblas.v
+++ b/vlas/cflags_d_cblas.v
@@ -1,9 +1,10 @@
 module vlas
 
 #flag linux -O2 -I/usr/local/include -I/usr/lib
-#flag linux -lopenblas -llapacke -L/usr/local/lib -L/usr/lib
+#flag linux -L/usr/local/lib -L/usr/lib
 #flag windows -O2
-#flag windows -lopenblas -lgfortran
+#flag windows -lgfortran
 #flag darwin -I/usr/local/opt/openblas/include
-#flag darwin -llapacke -lopenblas -L/usr/local/opt/openblas/lib
+#flag darwin -L/usr/local/opt/openblas/lib
 #flag -I@VMODROOT
+#flag -lopenblas -llapacke
diff --git a/vlas/cflags_notd_cblas.v b/vlas/cflags_notd_cblas.v
index 8a66ee902..ff8f70691 100644
--- a/vlas/cflags_notd_cblas.v
+++ b/vlas/cflags_notd_cblas.v
@@ -1,9 +1,10 @@
 module vlas
 
 #flag linux -O2 -I/usr/local/include -I/usr/lib
-#flag linux -llapacke -L/usr/local/lib -L/usr/lib
+#flag linux -L/usr/local/lib -L/usr/lib
 #flag windows -O2
-#flag windows -lopenblas -lgfortran
-#flag darwin -I/usr/local/opt/openblas/include
-#flag darwin -llapacke -lopenblas -L/usr/local/opt/openblas/lib
+#flag windows -lgfortran
+#flag darwin -I/usr/local/opt/lapack/include
+#flag darwin -L/usr/local/opt/lapack/lib
 #flag -I@VMODROOT
+#flag -llapacke