Skip to content

Commit

Permalink
Merge pull request #11656 from JuliaLang/nl/SSE2
Browse files Browse the repository at this point in the history
Raise an error when calling make with MARCHes known to fail
  • Loading branch information
tkelman committed Jun 13, 2015
2 parents f3a6461 + e247839 commit 4fe1f16
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,12 @@ endif

JULIA_CPU_TARGET ?= native

# Detect common pre-SSE2 JULIA_CPU_TARGET values known not to work (#7185)
ifneq ($(findstring $(JULIA_CPU_TARGET),i386 i486 i586 i686 pentium pentium2 pentium3),)
$(error Pre-SSE2 CPU targets not supported. To create a generic 32-bit x86 binary, \
pass 'MARCH=i686 JULIA_CPU_TARGET=pentium4', or 'MARCH=pentium4' if not building any dependencies.)
endif

# We map amd64 to x86_64 for compatibility with systems that identify 64-bit systems as such
ifeq ($(ARCH),amd64)
override ARCH = x86_64
Expand Down

0 comments on commit 4fe1f16

Please sign in to comment.