Skip to content

Commit d85158e

Browse files
author
David Dehaven
committed
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
Build system tweaks to allow building on OS X 10.9 and later Reviewed-by: erikj
1 parent f8c3816 commit d85158e

File tree

7 files changed

+297
-406
lines changed

7 files changed

+297
-406
lines changed

common/autoconf/basics.m4

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -386,6 +386,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
386386
[TOOLS_DIR=$with_tools_dir]
387387
)
388388
389+
# Xcode version will be validated later
390+
AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
391+
[explicit path to Xcode 4 (generally for building on 10.9 and later)])],
392+
[XCODE_PATH=$with_xcode_path]
393+
)
394+
389395
AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
390396
[use this directory as base for tools-dir and sys-root (for cross-compiling)])],
391397
[
@@ -634,10 +640,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
634640
# We can build without it.
635641
LDD="true"
636642
fi
637-
AC_PATH_PROG(OTOOL, otool)
638-
if test "x$OTOOL" = "x"; then
639-
OTOOL="true"
640-
fi
641643
AC_PATH_PROGS(READELF, [readelf greadelf])
642644
AC_PATH_PROG(HG, hg)
643645
AC_PATH_PROG(STAT, stat)

0 commit comments

Comments
 (0)