From fc59fc5d37cd3aa4e1bea69e2bb61f9509258485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Fri, 9 Aug 2024 22:34:22 +0100 Subject: [PATCH 1/3] Remove `USEGCC`/`USECLANG` dance in `Make.inc` --- Make.inc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Make.inc b/Make.inc index 87b0338..3f15a8d 100644 --- a/Make.inc +++ b/Make.inc @@ -1,4 +1,4 @@ -# -*- mode: makefile-gmake -*- +# -*- mode: makefile -*- ifneq ($(OS),Windows_NT) OS = $(shell uname) endif @@ -13,20 +13,8 @@ ifneq (,$(findstring CYGWIN,$(OS))) override OS := Windows_NT endif -USEGCC = 1 -USECLANG = 0 - CFLAGS-add += -Wall -O3 -ifeq ($(USECLANG),1) -USEGCC = 0 -CC = clang -endif - -ifeq ($(USEGCC),1) -CC = gcc -endif - ifeq ($(OS), Linux) SHLIB_EXT = so CFLAGS-add+=-fPIC From ae171aa66b87c2262076cfc6fc33c6b523935575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Fri, 9 Aug 2024 22:42:11 +0100 Subject: [PATCH 2/3] Add courtesy default value of `CC` in Make.inc --- Make.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Make.inc b/Make.inc index 3f15a8d..8acefa4 100644 --- a/Make.inc +++ b/Make.inc @@ -13,6 +13,10 @@ ifneq (,$(findstring CYGWIN,$(OS))) override OS := Windows_NT endif +# Default value, can be overriden on the command line +# or with an environment variable. +CC ?= gcc + CFLAGS-add += -Wall -O3 ifeq ($(OS), Linux) From 3b16cb0d5072087465899ed1a2d1422aedc46236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Fri, 9 Aug 2024 22:45:42 +0100 Subject: [PATCH 3/3] Set `CC` also in CI --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7d95cc4..3db973f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -33,4 +33,6 @@ jobs: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - run: make -j + env: + CC: gcc - run: julia test.jl