RFR: [9] 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
David DeHaven
david.dehaven at oracle.com
Wed May 21 04:30:49 UTC 2014
JBS Issue:
https://bugs.openjdk.java.net/browse/JDK-8043340
Summary:
We currently hard code the path to JavaVM.framework to /System/Library/Framworks. This worked when Apple installed header files in those frameworks when the command line tools were installed. Those headers are no longer installed so we need to change our paths to use the Mac OS X SDK path instead.
Most of the changes here are just adding $(MAC_SDK_PATH) to the JavaVM (and one case of ApplicationServices) framework. If MAC_SDK_PATH is undefined, then it will simply revert to the current behavior of building against the system frameworks. If configure cannot determine the path to the macosx SDK, then it will spit out a warning but otherwise proceed as normal unless it cannot find headers inside JavaVM.framework, then it will fail.
Changes of note:
- Added MAC_SDK_PATH, set to the absolute path to the macosx SDK as determined by "$(TOOLCHAIN_PATH)/xcodebuild -sdk macosx -version"
- Changed all -F arguments to -F$(MAC_SDK_PATH)
- I had to add -iframework$(MAC_SDK_PATH) to force it to compile and link all frameworks from the same SDK, otherwise great big gobs of deprecation warnings filled the screen.
- XCODEBUILD was added as we need to use the copy of the tool at the location specified by --with-tools-dir if provided, otherwise we would end up with the completely wrong path. If it's not found in the tool path then it uses the default /usr/bin/xcodebuild (if that's not there then the system is not configured properly...)
- Removed JavaVM.framework from the header search path (and changed MacosxDebuggerLocal.m accordingly) in hotspot, we shouldn't be using those headers
- I made not being able to find JavaVM.framework a fatal error in configure, since we can't build without those headers
Tested on 10.8 with Xcode 5.1 and Xcode 4.6.3 and on a clean 10.9 system with Xcode 5.1 against jdk9/hs. I will submit a JPRT sanity run shortly.
Patches:
http://cr.openjdk.java.net/~ddehaven/8043340/v0/top
http://cr.openjdk.java.net/~ddehaven/8043340/v0/hotspot
http://cr.openjdk.java.net/~ddehaven/8043340/v0/jdk
-DrD-
More information about the build-dev
mailing list