common/autoconf/basics.m4

*** 434,444 ****
  
    # These are not required on all platforms
    BASIC_PATH_PROGS(CYGPATH, cygpath)
    BASIC_PATH_PROGS(READLINK, [greadlink readlink])
    BASIC_PATH_PROGS(DF, df)
-   BASIC_PATH_PROGS(SETFILE, SetFile)
    BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
  ])
  
  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
  AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
--- 434,443 ----
*** 571,585 ****
    AC_ARG_WITH([extra-path], [AS_HELP_STRING([--with-extra-path],
        [prepend these directories to the default path])],
        [BASIC_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
    )
  
!   if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
!     # detect if Xcode is installed by running xcodebuild -version
      # if no Xcode installed, xcodebuild exits with 1
      # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
!     if /usr/bin/xcodebuild -version >/dev/null 2>&1; then
        # We need to use xcodebuild in the toolchain dir provided by the user, this will
        # fall back on the stub binary in /usr/bin/xcodebuild
        AC_PATH_PROG([XCODEBUILD], [xcodebuild], [/usr/bin/xcodebuild], [$TOOLCHAIN_PATH])
      else
        # this should result in SYSROOT being empty, unless --with-sysroot is provided
--- 570,586 ----
    AC_ARG_WITH([extra-path], [AS_HELP_STRING([--with-extra-path],
        [prepend these directories to the default path])],
        [BASIC_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
    )
  
!   # OPENJDK_BUILD_OS has not yet been setup
!   if test "`uname`" = "Darwin"; then
!     # If a devkit has been supplied, find xcodebuild in the toolchain_path.
!     # If not, detect if Xcode is installed by running xcodebuild -version
      # if no Xcode installed, xcodebuild exits with 1
      # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
!     if test "x$DEVKIT_ROOT" != x || /usr/bin/xcodebuild -version >/dev/null 2>&1; then
        # We need to use xcodebuild in the toolchain dir provided by the user, this will
        # fall back on the stub binary in /usr/bin/xcodebuild
        AC_PATH_PROG([XCODEBUILD], [xcodebuild], [/usr/bin/xcodebuild], [$TOOLCHAIN_PATH])
      else
        # this should result in SYSROOT being empty, unless --with-sysroot is provided
*** 959,968 ****
--- 960,970 ----
          AC_MSG_RESULT([no])
        else
          AC_MSG_RESULT([yes])
        fi
      fi
+     BASIC_REQUIRE_PROGS(SETFILE, SetFile)
    fi
  ])
  
  # Check if build directory is on local disk. If not possible to determine,
  # we prefer to claim it's local.