1.1 --- a/common/autoconf/basics.m4 Mon Dec 29 19:40:17 2014 -0800 1.2 +++ b/common/autoconf/basics.m4 Tue Jan 20 13:29:10 2015 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 # 1.5 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 1.6 +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. 1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 # 1.9 # This code is free software; you can redistribute it and/or modify it 1.10 @@ -386,6 +386,12 @@ 1.11 [TOOLS_DIR=$with_tools_dir] 1.12 ) 1.13 1.14 + # Xcode version will be validated later 1.15 + AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path], 1.16 + [explicit path to Xcode 4 (generally for building on 10.9 and later)])], 1.17 + [XCODE_PATH=$with_xcode_path] 1.18 + ) 1.19 + 1.20 AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit], 1.21 [use this directory as base for tools-dir and sys-root (for cross-compiling)])], 1.22 [ 1.23 @@ -634,10 +640,6 @@ 1.24 # We can build without it. 1.25 LDD="true" 1.26 fi 1.27 - AC_PATH_PROG(OTOOL, otool) 1.28 - if test "x$OTOOL" = "x"; then 1.29 - OTOOL="true" 1.30 - fi 1.31 AC_PATH_PROGS(READELF, [readelf greadelf]) 1.32 AC_PATH_PROG(HG, hg) 1.33 AC_PATH_PROG(STAT, stat)