Skip to content

Fix the link race #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qinsoon wants to merge 1 commit into
base: jdk-11
Choose a base branch
from
Open

Fix the link race #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ lto = true
# Metadata for the OpenJDK repository
[package.metadata.openjdk]
# Our CI matches the following line and extract mmtk/openjdk. If this line is updated, please check ci yaml files and make sure it works.
openjdk_repo = "https://github.com/mmtk/openjdk.git"
openjdk_version = "28e56ee32525c32c5a88391d0b01f24e5cd16c0f"
openjdk_repo = "https://github.com/qinsoon/openjdk.git"
openjdk_version = "3a5a2f81106878156f5156eb87292c3f9a0d00e0"

[dependencies]
libc = "0.2"
Expand Down
3 changes: 1 addition & 2 deletions openjdk/CompileThirdPartyHeap.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,10 @@ JVM_LDFLAGS += '-Wl,-rpath,$$ORIGIN'

FORCE:

THIRD_PARTY_HEAP_JVM_DEPS += $(LIB_MMTK)
TARGETS += $(LIB_MMTK)
JVM_SRC_DIRS += $(MMTK_CPP_ROOT) $(MMTK_CPP_ROOT)/barriers
JVM_CFLAGS += -std=c++11 -DINCLUDE_THIRD_PARTY_HEAP -DTHIRD_PARTY_HEAP_SRC=$(MMTK_CPP_ROOT)
ifeq ($(MMTK_VO_BIT), 1)
JVM_CFLAGS += -DMMTK_ENABLE_VO_BIT
endif

$(BUILD_LIBJVM): $(LIB_MMTK)
Loading