mirror of
https://github.com/corda/corda.git
synced 2025-01-19 11:16:54 +00:00
pass -march=i586 to gcc when targetting 32-bit x86
Recent versions of GCC will only give us __sync_bool_compare_and_swap_8 if we target i586 and above, apparently.
This commit is contained in:
parent
1ed03b9096
commit
05ff032f69
7
makefile
7
makefile
@ -57,11 +57,6 @@ java-home = /tmp
|
|||||||
ifdef openjdk
|
ifdef openjdk
|
||||||
classpath = openjdk
|
classpath = openjdk
|
||||||
options := $(options)-openjdk
|
options := $(options)-openjdk
|
||||||
ifeq ($(arch),x86_64)
|
|
||||||
openjdk-lib-dir = $(openjdk)/jre/lib/amd64
|
|
||||||
else
|
|
||||||
openjdk-lib-dir = $(openjdk)/jre/lib
|
|
||||||
endif
|
|
||||||
java-home = $(openjdk)/jre
|
java-home = $(openjdk)/jre
|
||||||
test-executable = $(executable-dynamic)
|
test-executable = $(executable-dynamic)
|
||||||
boot-classpath := $(boot-classpath):$(openjdk)/jre/lib/rt.jar
|
boot-classpath := $(boot-classpath):$(openjdk)/jre/lib/rt.jar
|
||||||
@ -252,7 +247,7 @@ endif
|
|||||||
ifneq ($(platform),darwin)
|
ifneq ($(platform),darwin)
|
||||||
ifeq ($(arch),i386)
|
ifeq ($(arch),i386)
|
||||||
# this is necessary to support __sync_bool_compare_and_swap:
|
# this is necessary to support __sync_bool_compare_and_swap:
|
||||||
cflags += -march=i486
|
cflags += -march=i586
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user