common/autoconf/generated-configure.sh

*** 1150,1159 ****
--- 1150,1160 ----
  with_debug_level
  with_jvm_variants
  with_devkit
  with_sys_root
  with_sysroot
+ with_build_sysroot
  with_tools_dir
  with_toolchain_path
  with_extra_path
  with_sdk_name
  with_conf_name
*** 2047,2056 ****
--- 2048,2058 ----
                            (server,client,minimal,core,zero,zeroshark,custom)
                            [server]
    --with-devkit           use this devkit for compilers, tools and resources
    --with-sys-root         alias for --with-sysroot for backwards compatability
    --with-sysroot          use this directory as sysroot
+   --with-build-sysroot    use this directory as build_sysroot
    --with-tools-dir        alias for --with-toolchain-path for backwards
                            compatibility
    --with-toolchain-path   prepend these directories when searching for
                            toolchain binaries (compilers etc)
    --with-extra-path       prepend these directories to the default path
*** 5106,5116 ****
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1471531493
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
--- 5108,5118 ----
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1473766817
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
*** 17081,17090 ****
--- 17083,17100 ----
  
  fi
  
  
  
+ # Check whether --with-build_sysroot was given.
+ if test "${with_build_sysroot+set}" = set; then :
+   withval=$with_build_sysroot; BUILD_SYSROOT=$with_build_sysroot
+ 
+ fi
+ 
+ 
+ 
  # Check whether --with-tools-dir was given.
  if test "${with_tools_dir+set}" = set; then :
    withval=$with_tools_dir;
    if test "x$with_tools_dir" != x; then
      if test "x$TOOLCHAIN_PATH" = x; then
*** 47308,47319 ****
--- 47318,47376 ----
      BUILD_LDCXX="$LDCXX"
      BUILD_NM="$NM"
      BUILD_AS="$AS"
      BUILD_OBJCOPY="$OBJCOPY"
      BUILD_STRIP="$STRIP"
+     if test "x$BUILD_SYSROOT" != "x"; then
+ 
+   if test "x$BUILD_SYSROOT" != "x"; then
+     if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+       if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+         # Solaris Studio does not have a concept of sysroot. Instead we must
+         # make sure the default include and lib dirs are appended to each
+         # compile and link command line. Must also add -I-xbuiltin to enable
+         # inlining of system functions and intrinsics.
+         BUILD_SYSROOT_CFLAGS="-I-xbuiltin -I$BUILD_SYSROOT/usr/include"
+         BUILD_SYSROOT_LDFLAGS="-L$BUILD_SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
+             -L$BUILD_SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
+             -L$BUILD_SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
+       fi
+     elif test "x$TOOLCHAIN_TYPE" = xgcc; then
+       BUILD_SYSROOT_CFLAGS="--sysroot=$BUILD_SYSROOT"
+       BUILD_SYSROOT_LDFLAGS="--sysroot=$BUILD_SYSROOT"
+     elif test "x$TOOLCHAIN_TYPE" = xclang; then
+       BUILD_SYSROOT_CFLAGS="-isysroot $BUILD_SYSROOT"
+       BUILD_SYSROOT_LDFLAGS="-isysroot $BUILD_SYSROOT"
+     fi
+     # Propagate the sysroot args to hotspot
+     BUILD_LEGACY_EXTRA_CFLAGS="$BUILD_LEGACY_EXTRA_CFLAGS $BUILD_SYSROOT_CFLAGS"
+     BUILD_LEGACY_EXTRA_CXXFLAGS="$BUILD_LEGACY_EXTRA_CXXFLAGS $BUILD_SYSROOT_CFLAGS"
+     BUILD_LEGACY_EXTRA_LDFLAGS="$BUILD_LEGACY_EXTRA_LDFLAGS $BUILD_SYSROOT_LDFLAGS"
+     # The global CFLAGS and LDFLAGS variables need these for configure to function
+     BUILD_CFLAGS="$BUILD_CFLAGS $BUILD_SYSROOT_CFLAGS"
+     BUILD_CPPFLAGS="$BUILD_CPPFLAGS $BUILD_EXTRA_CFLAGS $BUILD_SYSROOT_CFLAGS"
+     BUILD_CXXFLAGS="$BUILD_CXXFLAGS $BUILD_SYSROOT_CFLAGS"
+     BUILD_LDFLAGS="$BUILD_LDFLAGS $BUILD_SYSROOT_LDFLAGS"
+   fi
+ 
+   if test "x$OPENJDK_BUILD_OS" = xmacosx; then
+     # We also need -iframework<path>/System/Library/Frameworks
+     BUILD_SYSROOT_CFLAGS="$BUILD_SYSROOT_CFLAGS -iframework $BUILD_SYSROOT/System/Library/Frameworks"
+     BUILD_SYSROOT_LDFLAGS="$BUILD_SYSROOT_LDFLAGS -iframework $BUILD_SYSROOT/System/Library/Frameworks"
+     # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
+     # set this here so it doesn't have to be peppered throughout the forest
+     BUILD_SYSROOT_CFLAGS="$BUILD_SYSROOT_CFLAGS -F $BUILD_SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
+     BUILD_SYSROOT_LDFLAGS="$BUILD_SYSROOT_LDFLAGS -F $BUILD_SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
+   fi
+ 
+ 
+ 
+ 
+     else
        BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS"
        BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
+     fi
      BUILD_AR="$AR"
  
  
    if test "x$CC_VERSION_NUMBER" != "x$CXX_VERSION_NUMBER"; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C and C++ compiler have different version numbers, $CC_VERSION_NUMBER vs $CXX_VERSION_NUMBER." >&5