ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix OS X build regressions

Browse Source
This commit is contained in:
Joel Dice 2012-06-02 18:56:07 -06:00
parent d61501453f
commit 9520b03333
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
makefile
View File

@ -1,7 +1,7 @@
MAKEFLAGS = -s MAKEFLAGS = -s
name = avian name = avian
version = 0.5 version = 0.6
build-arch := $(shell uname -m \ build-arch := $(shell uname -m \
| sed 's/^i.86$$/i386/' \ | sed 's/^i.86$$/i386/' \
@ -206,7 +206,7 @@ converter-cflags = -D__STDC_CONSTANT_MACROS -Isrc/binaryToObject -Isrc/ \
-fno-rtti -fno-exceptions \ -fno-rtti -fno-exceptions \
-DAVIAN_TARGET_ARCH=AVIAN_ARCH_UNKNOWN \ -DAVIAN_TARGET_ARCH=AVIAN_ARCH_UNKNOWN \
-DAVIAN_TARGET_PLATFORM=AVIAN_PLATFORM_UNKNOWN \ -DAVIAN_TARGET_PLATFORM=AVIAN_PLATFORM_UNKNOWN \
-Wall -Wextra -Werror -Wunused-parameter -Winit-self -Wall -Wextra -Werror -Wunused-parameter -Winit-self -Wno-non-virtual-dtor
cflags = $(build-cflags) cflags = $(build-cflags)
@ -457,7 +457,11 @@ ifeq ($(mode),stress-major)
strip = : strip = :
endif endif
ifeq ($(mode),fast) ifeq ($(mode),fast)
ifeq ($(use-clang),true)
optimization-cflags = -O4 -g3 -DNDEBUG optimization-cflags = -O4 -g3 -DNDEBUG
else
optimization-cflags = -O3 -g3 -DNDEBUG
endif
use-lto = true use-lto = true
endif endif
ifeq ($(mode),small) ifeq ($(mode),small)
@ -925,7 +929,9 @@ $(vm-cpp-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
$(compile-object) $(compile-object)
$(build)/%.o: $(lzma)/C/%.c $(build)/%.o: $(lzma)/C/%.c
$(compile-object) @echo "compiling $(@)"
@mkdir -p $(dir $(@))
$(cxx) $(cflags) -Wno-error -c $$($(windows-path) $(<)) $(call output,$(@))
$(vm-asm-objects): $(build)/%-asm.o: $(src)/%.S $(vm-asm-objects): $(build)/%-asm.o: $(src)/%.S
$(compile-asm-object) $(compile-asm-object)
@ -1002,7 +1008,10 @@ $(generator-objects): $(build)/%-build.o: $(src)/%.cpp
$(compile-generator-object) $(compile-generator-object)
$(build)/%-build.o: $(lzma)/C/%.c $(build)/%-build.o: $(lzma)/C/%.c
$(compile-generator-object) @echo "compiling $(@)"
@mkdir -p $(dir $(@))
$(build-cxx) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(build-cflags) \
-Wno-error -c $(<) -o $(@)
$(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp $(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp
$(compile-object) $(compile-object)