mirror of
https://github.com/corda/corda.git
synced 2025-01-06 05:04:20 +00:00
support building from a directory with spaces in its name
This commit is contained in:
parent
a6f1b92b63
commit
471ac4d960
8
makefile
8
makefile
@ -93,8 +93,8 @@ ifeq ($(platform),darwin)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(platform),windows)
|
ifeq ($(platform),windows)
|
||||||
inc = $(root)/win32/include
|
inc = "$(root)/win32/include"
|
||||||
lib = $(root)/win32/lib
|
lib = "$(root)/win32/lib"
|
||||||
|
|
||||||
system = windows
|
system = windows
|
||||||
object-format = pe-i386
|
object-format = pe-i386
|
||||||
@ -333,7 +333,7 @@ $(boot-object): $(boot-source)
|
|||||||
$(build)/classpath.jar: $(classpath-dep)
|
$(build)/classpath.jar: $(classpath-dep)
|
||||||
(wd=$$(pwd); \
|
(wd=$$(pwd); \
|
||||||
cd $(classpath-build); \
|
cd $(classpath-build); \
|
||||||
$(jar) c0f $${wd}/$(@) $$(find . -name '*.class'))
|
$(jar) c0f "$${wd}/$(@)" $$(find . -name '*.class'))
|
||||||
|
|
||||||
$(binaryToMacho): $(src)/binaryToMacho.cpp
|
$(binaryToMacho): $(src)/binaryToMacho.cpp
|
||||||
$(cxx) $(^) -o $(@)
|
$(cxx) $(^) -o $(@)
|
||||||
@ -347,7 +347,7 @@ else
|
|||||||
(wd=$$(pwd); \
|
(wd=$$(pwd); \
|
||||||
cd $(build); \
|
cd $(build); \
|
||||||
$(objcopy) -I binary classpath.jar \
|
$(objcopy) -I binary classpath.jar \
|
||||||
-O $(object-format) -B $(object-arch) $${wd}/$(@))
|
-O $(object-format) -B $(object-arch) "$${wd}/$(@)")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(generator-objects): $(native-build)/%.o: $(src)/%.cpp
|
$(generator-objects): $(native-build)/%.o: $(src)/%.cpp
|
||||||
|
Loading…
Reference in New Issue
Block a user