10
1
mirror of https://github.com/pfloos/quack synced 2024-12-22 12:23:42 +01:00

fixing merge with ci

This commit is contained in:
Pierre-Francois Loos 2024-11-25 10:45:13 +01:00
parent 785683a111
commit 4fd5cec4be
2 changed files with 4 additions and 6 deletions

View File

@ -6,7 +6,7 @@ QUACK_ROOT="/NOT/FOUND"
QUACK_ROOT=$(dirname $0) QUACK_ROOT=$(dirname $0)
;; ;;
*) *)
QUACK_ROOT=$(dirname ${BASH_SOURCE}[0]) QUACK_ROOT=$(dirname ${BASH_SOURCE})[0]
;; ;;
esac esac

View File

@ -41,7 +41,7 @@ CC = gcc
CXX = g++ CXX = g++
LAPACK=-lblas -llapack LAPACK=-lblas -llapack
STDCXX=-lc++ STDCXX=-lc++
FIX_ORDER_OF_LIBS=-Wl,--start-group FIX_ORDER_OF_LIBS=
""" """
compile_gfortran_mac_debug = """ compile_gfortran_mac_debug = """
@ -66,16 +66,14 @@ STDCXX=-lstdc++
FIX_ORDER_OF_LIBS=-Wl,--start-group FIX_ORDER_OF_LIBS=-Wl,--start-group
""" """
if sys.platform.lower() == "darwin":
if sys.platform == "Darwin":
if DEBUG: if DEBUG:
compiler = compile_gfortran_mac_debug compiler = compile_gfortran_mac_debug
else: else:
compiler = compile_gfortran_mac 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: if DEBUG:
compiler = compile_gfortran_linux_debug compiler = compile_gfortran_linux_debug