From 717ab32e03518795b6a1745e3e7ef36c0ffb0b6f Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Fri, 11 Aug 2023 14:11:38 +0800 Subject: [PATCH] Show the version after cd That will show the actual used cargo version specified by `rust-toolchain`. --- openjdk/CompileThirdPartyHeap.gmk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openjdk/CompileThirdPartyHeap.gmk b/openjdk/CompileThirdPartyHeap.gmk index e946eb7e..2332fd0d 100644 --- a/openjdk/CompileThirdPartyHeap.gmk +++ b/openjdk/CompileThirdPartyHeap.gmk @@ -66,9 +66,8 @@ $(LIB_MMTK): FORCE echo -e $(YELLOW)Local OpenJDK version $(OPENJDK_LOCAL_VERSION)$(NC); \ echo -e $(YELLOW)mmtk/Cargo.toml OpenJDK version $(OPENJDK_VERSION)$(NC); \ fi - cargo --version - echo "cd $(MMTK_RUST_ROOT) && cargo build $(CARGO_PROFILE_FLAG) --target $(HOST_TRIPLE) $(GC_FEATURES)" - cd $(MMTK_RUST_ROOT) && cargo build $(CARGO_PROFILE_FLAG) --target $(HOST_TRIPLE) $(GC_FEATURES) + echo "cd $(MMTK_RUST_ROOT) && cargo --version && cargo build $(CARGO_PROFILE_FLAG) --target $(HOST_TRIPLE) $(GC_FEATURES)" + cd $(MMTK_RUST_ROOT) && cargo --version && cargo build $(CARGO_PROFILE_FLAG) --target $(HOST_TRIPLE) $(GC_FEATURES) cp $(MMTK_RUST_ROOT)/target/$(HOST_TRIPLE)/$(CARGO_PROFILE)/libmmtk_openjdk.so $(LIB_MMTK) JVM_LIBS += -L$(JVM_LIB_OUTPUTDIR) -lmmtk_openjdk