darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-26 22:00:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[macos] Setup LC_RPATH to locate JavaNativeFoundation.framework

Browse Source 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2020-05-17 15:19:39 -07:00
parent 55b3ebec85
commit a0990b15c3
6 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/lib/Awt2dLibraries.gmk
View File

@ -245,6 +245,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
LIBS_macosx := -lmlib_image \
-framework Cocoa \
-framework OpenGL \
-Wl$(COMMA)-rpath$(COMMA)@loader_path/../Frameworks \
-framework JavaNativeFoundation \
-framework JavaRuntimeSupport \
-framework ApplicationServices \

1
make/lib/Lib-java.base.gmk
View File

@ -114,6 +114,7 @@ ifeq ($(call isTargetOs, macosx), true)
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := \
-lobjc \
-Wl$(COMMA)-rpath$(COMMA)@loader_path/../Frameworks \
-framework JavaNativeFoundation \
-framework CoreServices \
-framework Security \

1
make/lib/Lib-java.desktop.gmk
View File

@ -105,6 +105,7 @@ ifeq ($(call isTargetOs, macosx), true)
-framework Cocoa \
-framework Security \
-framework ExceptionHandling \
-Wl$(COMMA)-rpath$(COMMA)@loader_path/../Frameworks \
-framework JavaNativeFoundation \
-framework JavaRuntimeSupport \
-framework OpenGL \

2
make/lib/Lib-java.security.jgss.gmk
View File

@ -80,7 +80,7 @@ ifneq ($(BUILD_CRYPTO), false)
DISABLED_WARNINGS_clang := deprecated-declarations, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := -framework JavaNativeFoundation -framework Cocoa \
LIBS := -Wl$(COMMA)-rpath$(COMMA)@loader_path/../Frameworks -framework JavaNativeFoundation -framework Cocoa \
-framework SystemConfiguration -framework Kerberos, \
))

2
make/lib/Lib-jdk.hotspot.agent.gmk
View File

@ -74,7 +74,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
LIBS_linux := $(LIBDL), \
LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
LIBS_macosx := -framework Foundation -Wl$(COMMA)-rpath$(COMMA)@loader_path/../Frameworks -framework JavaNativeFoundation \
-framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
LIBS_windows := dbgeng.lib, \
))

2
make/test/JtregNativeJdk.gmk
View File

@ -79,7 +79,7 @@ endif
ifeq ($(call isTargetOs, macosx), true)
BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := -framework JavaVM \
-framework Cocoa -framework JavaNativeFoundation
-framework Cocoa -Wl$(COMMA)-rpath$(COMMA)@loader_path/../Frameworks -framework JavaNativeFoundation
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJniInvocationTest := -ljli
else
BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c