common/autoconf/spec.gmk.in

rev 1212 : 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
Summary: Build system tweaks to allow building on OS X 10.9 and later
Reviewed-by:

*** 1,7 ****
  #
! # Copyright (c) 2011, 2013, 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 340,349 ****
--- 340,357 ----
  #CPPFLAGS:=@CPPFLAGS@
  
  # The linker can be gcc or ld on posix systems, or link.exe on windows systems.
  LD:=@FIXPATH@ @LD@
  
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+   # Xcode SDK and tools path
+   SDKPATH:=@SDKPATH@
+   DEVELOPER_DIR:=@DEVELOPER_DIR@
+   # This needs to be visible by all the Xcode tools to work properly
+   export DEVELOPER_DIR
+ endif
+ 
  # The linker on older SuSE distros (e.g. on SLES 10) complains with:
  # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
  # if feeded with a version script which contains named tags.
  USING_BROKEN_SUSE_LD:=@USING_BROKEN_SUSE_LD@
  
*** 384,395 ****
  NM:=@NM@
  GNM:=@GNM@
  STRIP:=@STRIP@
  MCS:=@MCS@
  
- LIPO:=@LIPO@
- 
  # Command to create a shared library
  SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@
  
  # Options to linker to specify a mapfile.
  # (Note absence of := assignment, because we do not want to evaluate the macro body here)
--- 392,401 ----
*** 537,546 ****
--- 543,553 ----
  SETFILE:=@SETFILE@
  XATTR:=@XATTR@
  JT_HOME:=@JT_HOME@
  JTREGEXE:=@JTREGEXE@
  
+ XCODEBUILD=@XCODEBUILD@
  FIXPATH:=@FIXPATH@
  
  # Where the build output is stored for your convenience.
  BUILD_LOG:=@BUILD_LOG@
  BUILD_LOG_PREVIOUS:=@BUILD_LOG_PREVIOUS@