Skip to content

Commit

Permalink
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
Browse files Browse the repository at this point in the history
Build system tweaks to allow building on OS X 10.9 and later

Reviewed-by: erikj
  • Loading branch information
David Dehaven committed Jan 20, 2015
1 parent f8c3816 commit d85158e
Show file tree
Hide file tree
Showing 7 changed files with 297 additions and 406 deletions.
12 changes: 7 additions & 5 deletions common/autoconf/basics.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -386,6 +386,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
[TOOLS_DIR=$with_tools_dir]
)
# Xcode version will be validated later
AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
[explicit path to Xcode 4 (generally for building on 10.9 and later)])],
[XCODE_PATH=$with_xcode_path]
)
AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
[use this directory as base for tools-dir and sys-root (for cross-compiling)])],
[
Expand Down Expand Up @@ -634,10 +640,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
# We can build without it.
LDD="true"
fi
AC_PATH_PROG(OTOOL, otool)
if test "x$OTOOL" = "x"; then
OTOOL="true"
fi
AC_PATH_PROGS(READELF, [readelf greadelf])
AC_PATH_PROG(HG, hg)
AC_PATH_PROG(STAT, stat)
Expand Down
Loading

0 comments on commit d85158e

Please sign in to comment.