From f36b9a20227408e8eddfe9b2f11a91f0b74e0784 Mon Sep 17 00:00:00 2001
From: Alejandro Gallo <aamsgallo@gmail.com>
Date: Fri, 3 Sep 2021 15:52:34 +0200
Subject: [PATCH] Update etc configs

---
 etc/config/gcc.mk     | 15 ++++++++++++---
 etc/nix/scalapack.nix |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/etc/config/gcc.mk b/etc/config/gcc.mk
index cf3aee4..4ed21b5 100644
--- a/etc/config/gcc.mk
+++ b/etc/config/gcc.mk
@@ -5,7 +5,16 @@ CXX = mpic++
 CXXFLAGS += -I$(ATRIP_ROOT)/include
 
 CXXFLAGS += -I$(CTF_INCLUDE_PATH)
-LDFLAGS += -Wl,-Bstatic -L$(CTF_BUILD_PATH)/lib -lctf
-LDFLAGS += -fopenmp -L/usr/lib -L/opt/OpenBLAS/lib -lopenblas
-LDFLAGS += -L/usr/local/lib -lscalapack
+CXXFLAGS += -fPIC
+
+LDFLAGS += -fopenmp
+LDFLAGS += -Wl,-Bstatic
+LDFLAGS += -L$(CTF_BUILD_PATH)/lib -lctf
+LDFLAGS += -L$(SCALAPACK_PATH)/lib -lscalapack
 LDFLAGS += -Wl,-Bdynamic
+
+bench: CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
+bench: LDFLAGS += -Wl,-Bstatic
+bench: LDFLAGS += -Llib/ -latrip
+bench: LDFLAGS += -L$(OPENBLAS_PATH)/lib -lopenblas
+bench: LDFLAGS += -Wl,-Bdynamic
diff --git a/etc/nix/scalapack.nix b/etc/nix/scalapack.nix
index 04864da..ea6dcd1 100644
--- a/etc/nix/scalapack.nix
+++ b/etc/nix/scalapack.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     cmakeFlagsArray+=(
-      -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON
+      -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
       -DLAPACK_LIBRARIES="-llapack"
       -DBLAS_LIBRARIES="-lblas"
       )