Print this page


Split Close
Expand all
Collapse all
          --- old/common/autoconf/flags.m4
          +++ new/common/autoconf/flags.m4
↓ open down ↓ 80 lines elided ↑ open up ↑
  81   81  [
  82   82    if test "x[$]$1SYSROOT" != "x"; then
  83   83      if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  84   84        if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  85   85          # Solaris Studio does not have a concept of sysroot. Instead we must
  86   86          # make sure the default include and lib dirs are appended to each
  87   87          # compile and link command line. Must also add -I-xbuiltin to enable
  88   88          # inlining of system functions and intrinsics.
  89   89          $1SYSROOT_CFLAGS="-I-xbuiltin -I[$]$1SYSROOT/usr/include"
  90   90          $1SYSROOT_LDFLAGS="-L[$]$1SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
  91      -            -L[$]$1SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
  92      -            -L[$]$1SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
       91 +            -L[$]$1SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR"
  93   92        fi
  94   93      elif test "x$TOOLCHAIN_TYPE" = xgcc; then
  95   94        $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
  96   95        $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
  97   96      elif test "x$TOOLCHAIN_TYPE" = xclang; then
  98   97        $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
  99   98        $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
 100   99      fi
 101  100      # Propagate the sysroot args to hotspot
 102  101      $1LEGACY_EXTRA_CFLAGS="[$]$1LEGACY_EXTRA_CFLAGS [$]$1SYSROOT_CFLAGS"
↓ open down ↓ 1367 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX