Mercurial > hg > graal-compiler
changeset 13094:c0085eefbd42
fixed serviceability agent build issue on MacOS
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 20 Nov 2013 22:40:27 +0100 |
| parents | ec0f6ecc0b7a |
| children | f705fc04faa5 |
| files | make/bsd/makefiles/saproc.make |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/saproc.make Wed Nov 20 22:16:48 2013 +0100 +++ b/make/bsd/makefiles/saproc.make Wed Nov 20 22:40:27 2013 +0100 @@ -64,7 +64,11 @@ else ifeq ($(OS_VENDOR), Darwin) SASRCFILES = $(DARWIN_NON_STUB_SASRCFILES) - SALIBS = -g -framework Foundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation + ifeq ($(wildcard /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Frameworks),) + SALIBS = -g -framework Foundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation + else + SALIBS = -g -framework Foundation -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation + endif #objc compiler blows up on -march=i586, perhaps it should not be included in the macosx intel 32-bit C++ compiles? SAARCH = $(subst -march=i586,,$(ARCHFLAG)) else @@ -153,13 +157,13 @@ install_saproc: $(BUILDLIBSAPROC) @echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)" ifeq ($(OS_VENDOR), Darwin) - $(QUIETLY) test -d $(LIBSAPROC_DEBUGINFO) && \ + -$(QUIETLY) test -d $(LIBSAPROC_DEBUGINFO) && \ cp -f -r $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO) else $(QUIETLY) test -f $(LIBSAPROC_DEBUGINFO) && \ cp -f $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO) endif - $(QUIETLY) test -f $(LIBSAPROC_DIZ) && \ + -$(QUIETLY) test -f $(LIBSAPROC_DIZ) && \ cp -f $(LIBSAPROC_DIZ) $(DEST_SAPROC_DIZ) $(QUIETLY) cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"