Skip to content

Commit

Permalink
Merge pull request #48 from giordano/patch-1
Browse files Browse the repository at this point in the history
Remove `USEGCC`/`USECLANG` dance in `Make.inc`
  • Loading branch information
ViralBShah authored Aug 9, 2024
2 parents be1c366 + 3b16cb0 commit 7444770
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@ jobs:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- run: make -j
env:
CC: gcc
- run: julia test.jl
16 changes: 4 additions & 12 deletions Make.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- mode: makefile-gmake -*-
# -*- mode: makefile -*-
ifneq ($(OS),Windows_NT)
OS = $(shell uname)
endif
Expand All @@ -13,20 +13,12 @@ ifneq (,$(findstring CYGWIN,$(OS)))
override OS := Windows_NT
endif

USEGCC = 1
USECLANG = 0
# Default value, can be overriden on the command line
# or with an environment variable.
CC ?= gcc

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
Expand Down

0 comments on commit 7444770

Please sign in to comment.