ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 11:16:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #489 from ReadyTalk/timestamps

Browse Source 
fix timestamp-related bug in makefile
This commit is contained in:
Joshua Warner 2016-06-22 03:26:17 +00:00 committed by GitHub
commit 110914d89f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makefile
View File

@ -1807,18 +1807,12 @@ $(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep)
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(generator) -cp $(boot-classpath) -i $(<) -o $(@) -t $(call gen-arg,$(@)) $(generator) -cp $(boot-classpath) -i $(<) -o $(@) -t $(call gen-arg,$(@))
$(classpath-build)/%.class: $(classpath-src)/%.java
@echo $(<)
$(classpath-dep): $(classpath-sources) $(classpath-jar-dep) $(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
@echo "compiling classpath classes" @echo "compiling classpath classes"
@mkdir -p $(classpath-build) @mkdir -p $(classpath-build)
classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \ $(javac) -source 1.$(java-version) -target 1.$(java-version) \
$(classpath-classes) arch=$(build-arch) platform=$(bootimage-platform))"; \ -d $(classpath-build) -bootclasspath $(boot-classpath) \
if [ -n "$${classes}" ]; then \ $(classpath-sources)
$(javac) -source 1.$(java-version) -target 1.$(java-version) \
-d $(classpath-build) -bootclasspath $(boot-classpath) \
$${classes}; fi
@touch $(@) @touch $(@)
$(build)/android-src/%.cpp: $(luni-native)/%.cpp $(build)/android-src/%.cpp: $(luni-native)/%.cpp