ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-17 02:09:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix OSX build regression

Browse Source
This commit is contained in:
Joel Dice 2009-08-27 09:30:34 -06:00
parent ca271e5ab9
commit 4df81911fe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makefile
View File

@ -226,7 +226,7 @@ ifeq ($(mode),small)
cflags += -Os -g3 -DNDEBUG cflags += -Os -g3 -DNDEBUG
endif endif
oflag = -o output = -o $(1)
as := $(cc) as := $(cc)
ld := $(cc) ld := $(cc)
build-ld := $(build-cc) build-ld := $(build-cc)
@ -244,7 +244,7 @@ ifdef msvc
shared = -dll shared = -dll
lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \ lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \
-DEFAULTLIB:zlib -DEFAULTLIB:zlib
oflag = -Fo output = -Fo$(1)
ifeq ($(mode),debug) ifeq ($(mode),debug)
cflags += -Od -Zi cflags += -Od -Zi
@ -547,7 +547,7 @@ $(test-extra-dep): $(test-extra-sources)
define compile-object define compile-object
@echo "compiling $(@)" @echo "compiling $(@)"
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(cxx) $(cflags) -c $(<) $(oflag)$(@) $(cxx) $(cflags) -c $(<) $(call output,$(@))
endef endef
define compile-asm-object define compile-asm-object
@ -575,7 +575,7 @@ $(driver-dynamic-object): $(driver-source)
@echo "compiling $(@)" @echo "compiling $(@)"
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(cxx) $(cflags) -DBOOT_LIBRARY=\"$(so-prefix)$(name)$(so-suffix)\" \ $(cxx) $(cflags) -DBOOT_LIBRARY=\"$(so-prefix)$(name)$(so-suffix)\" \
-c $(<) $(oflag)$(@) -c $(<) $(call output,$(@))
$(boot-object): $(boot-source) $(boot-object): $(boot-source)
$(compile-object) $(compile-object)
@ -586,7 +586,7 @@ $(build)/classpath.jar: $(classpath-dep)
$(jar) c0f "$$($(native-path) "$${wd}/$(@)")" .) $(jar) c0f "$$($(native-path) "$${wd}/$(@)")" .)
$(binaryToMacho): $(src)/binaryToMacho.cpp $(binaryToMacho): $(src)/binaryToMacho.cpp
$(cxx) $(^) $(oflag)$(@) $(cxx) $(^) $(call output,$(@))
$(classpath-object): $(build)/classpath.jar $(binaryToMacho) $(classpath-object): $(build)/classpath.jar $(binaryToMacho)
@echo "creating $(@)" @echo "creating $(@)"