From 4fd5cec4be63c68241efb5adf885d0fc27ae08a3 Mon Sep 17 00:00:00 2001 From: Pierre-Francois Loos Date: Mon, 25 Nov 2024 10:45:13 +0100 Subject: [PATCH] fixing merge with ci --- quack.rc | 2 +- src/make_ninja.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/quack.rc b/quack.rc index d7396a8..990f2ac 100644 --- a/quack.rc +++ b/quack.rc @@ -6,7 +6,7 @@ QUACK_ROOT="/NOT/FOUND" QUACK_ROOT=$(dirname $0) ;; *) - QUACK_ROOT=$(dirname ${BASH_SOURCE}[0]) + QUACK_ROOT=$(dirname ${BASH_SOURCE})[0] ;; esac diff --git a/src/make_ninja.py b/src/make_ninja.py index edeb379..09d3a72 100755 --- a/src/make_ninja.py +++ b/src/make_ninja.py @@ -41,7 +41,7 @@ CC = gcc CXX = g++ LAPACK=-lblas -llapack STDCXX=-lc++ -FIX_ORDER_OF_LIBS=-Wl,--start-group +FIX_ORDER_OF_LIBS= """ compile_gfortran_mac_debug = """ @@ -66,16 +66,14 @@ STDCXX=-lstdc++ FIX_ORDER_OF_LIBS=-Wl,--start-group """ - - -if sys.platform == "Darwin": +if sys.platform.lower() == "darwin": if DEBUG: compiler = compile_gfortran_mac_debug else: compiler = compile_gfortran_mac -elif sys.platform == "Linux" or os.path.exists('/proc/version'): +elif sys.platform.lower() == "linux" or os.path.exists('/proc/version'): if DEBUG: compiler = compile_gfortran_linux_debug