Skip to content

Commit db24332

Browse files
authored
Merge pull request #314 from JuliaMath/aa/clang-aarch64-fixes
Fixes for building on AArch64 with Clang
2 parents 49a3204 + 4d2d83f commit db24332

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Make.inc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- mode: makefile-gmake -*-
2+
# vi:ft=make
23

34
# Default build rule for any Makefile in this project: all
45
default: all
@@ -28,10 +29,6 @@ endif
2829
# Just Run: make clean && make coverage -j
2930
CODE_COVERAGE ?= 0
3031

31-
USEGCC ?= 1
32-
USECLANG ?= 0
33-
TOOLPREFIX ?=
34-
3532
ifneq (,$(findstring $(OS),Darwin FreeBSD OpenBSD))
3633
USEGCC ?= 0
3734
USECLANG ?= 1
@@ -49,10 +46,14 @@ USEGCC = 0
4946
TOOLPREFIX = llvm-
5047
endif
5148

49+
USEGCC ?= 1
50+
USECLANG ?= 0
51+
TOOLPREFIX ?=
52+
5253
AR := $(TOOLPREFIX)ar
5354

5455
ifeq ($(USECLANG),1)
55-
USEGCC ?= 0
56+
USEGCC = 0
5657
CC = clang
5758
CFLAGS_add += -fno-builtin -fno-strict-aliasing
5859
endif
@@ -171,7 +172,7 @@ ifneq ($(filter $(ARCH),i387 amd64),)
171172
# linux x86_64, for instance, `long double` is 80 bits wide, whereas on macOS aarch64,
172173
# `long double` is the same as `double`.
173174
LONG_DOUBLE_NOT_DOUBLE := 1
174-
else ifeq ($(ARCH), aarch64 riscv64)
175+
else ifeq ($(ARCH), aarch64)
175176
ifeq ($(filter $(OS),Darwin WINNT),)
176177
LONG_DOUBLE_NOT_DOUBLE := 1
177178
endif

0 commit comments

Comments
 (0)