common/autoconf/build-performance.m4
author bpb
Mon, 01 Feb 2016 15:00:02 -0800
changeset 36443 d9d59282fc1a
parent 35035 053bef224e47
child 35747 aeaa6d0101a8
permissions -rw-r--r--
8148628: TIFFDirectory(getAsMetaData) created with one TIFFField having a IFD pointer tag throws ClassCastException & other naming differences (JEP 262) Summary: Clean up some handling of TIFFDirectory instances contained in TIFFFields and make a couple of minor changes to Exif and GeoTIFF tag names. Reviewed-by: prr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     1
#
34594
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
     2
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     4
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    10
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    15
# accompanied this code).
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    16
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    20
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    23
# questions.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    24
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    25
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    26
AC_DEFUN([BPERF_CHECK_CORES],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    27
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    28
  AC_MSG_CHECKING([for number of cores])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    29
  NUM_CORES=1
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    30
  FOUND_CORES=no
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    31
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    32
  if test -f /proc/cpuinfo; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    33
    # Looks like a Linux (or cygwin) system
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    34
    NUM_CORES=`cat /proc/cpuinfo  | grep -c processor`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    35
    FOUND_CORES=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    36
  elif test -x /usr/sbin/psrinfo; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    37
    # Looks like a Solaris system
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    38
    NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    39
    FOUND_CORES=yes
35035
053bef224e47 8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents: 34867
diff changeset
    40
  elif test -x /usr/sbin/sysctl; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    41
    # Looks like a MacOSX system
35035
053bef224e47 8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents: 34867
diff changeset
    42
    NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    43
    FOUND_CORES=yes
22467
kvn
parents: 22466 20363
diff changeset
    44
  elif test "x$OPENJDK_BUILD_OS" = xaix ; then
kvn
parents: 22466 20363
diff changeset
    45
    NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'`
kvn
parents: 22466 20363
diff changeset
    46
    FOUND_CORES=yes
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    47
  elif test -n "$NUMBER_OF_PROCESSORS"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    48
    # On windows, look in the env
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    49
    NUM_CORES=$NUMBER_OF_PROCESSORS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    50
    FOUND_CORES=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    51
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    52
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    53
  if test "x$FOUND_CORES" = xyes; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    54
    AC_MSG_RESULT([$NUM_CORES])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    55
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    56
    AC_MSG_RESULT([could not detect number of cores, defaulting to 1])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    57
    AC_MSG_WARN([This will disable all parallelism from build!])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    58
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    59
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    60
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    61
AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    62
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    63
  AC_MSG_CHECKING([for memory size])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    64
  # Default to 1024 MB
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    65
  MEMORY_SIZE=1024
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    66
  FOUND_MEM=no
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    67
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    68
  if test -f /proc/meminfo; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    69
    # Looks like a Linux (or cygwin) system
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    70
    MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    71
    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    72
    FOUND_MEM=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    73
  elif test -x /usr/sbin/prtconf; then
22467
kvn
parents: 22466 20363
diff changeset
    74
    # Looks like a Solaris or AIX system
kvn
parents: 22466 20363
diff changeset
    75
    MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    76
    FOUND_MEM=yes
35035
053bef224e47 8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents: 34867
diff changeset
    77
  elif test -x /usr/sbin/sysctl; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    78
    # Looks like a MacOSX system
35035
053bef224e47 8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents: 34867
diff changeset
    79
    MEMORY_SIZE=`/usr/sbin/sysctl -n hw.memsize`
053bef224e47 8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents: 34867
diff changeset
    80
    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    81
    FOUND_MEM=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    82
  elif test "x$OPENJDK_BUILD_OS" = xwindows; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    83
    # Windows, but without cygwin
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    84
    MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    85
    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    86
    FOUND_MEM=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    87
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    88
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    89
  if test "x$FOUND_MEM" = xyes; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    90
    AC_MSG_RESULT([$MEMORY_SIZE MB])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    91
  else
23985
39f417e8c59f 8007327: Emit MEMORY_SIZE into spec.gmk
mduigou
parents: 23428
diff changeset
    92
    AC_MSG_RESULT([could not detect memory size, defaulting to $MEMORY_SIZE MB])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    93
    AC_MSG_WARN([This might seriously impact build performance!])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
    94
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    95
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    96
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    97
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    98
[
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
    99
  # How many cores do we have on this build system?
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   100
  AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   101
      [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])])
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   102
  if test "x$with_num_cores" = x; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   103
    # The number of cores were not specified, try to probe them.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   104
    BPERF_CHECK_CORES
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   105
  else
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   106
    NUM_CORES=$with_num_cores
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   107
  fi
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   108
  AC_SUBST(NUM_CORES)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   109
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   110
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   111
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_MEMORY],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   112
[
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   113
  # How much memory do we have on this build system?
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   114
  AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   115
      [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])])
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   116
  if test "x$with_memory_size" = x; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   117
    # The memory size was not specified, try to probe it.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   118
    BPERF_CHECK_MEMORY_SIZE
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   119
  else
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   120
    MEMORY_SIZE=$with_memory_size
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   121
  fi
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   122
  AC_SUBST(MEMORY_SIZE)
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   123
])
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   124
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   125
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS],
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   126
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   127
  # Provide a decent default number of parallel jobs for make depending on
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   128
  # number of cores, amount of memory and machine architecture.
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   129
  AC_ARG_WITH(jobs, [AS_HELP_STRING([--with-jobs],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   130
      [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])])
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   131
  if test "x$with_jobs" = x; then
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   132
    # Number of jobs was not specified, calculate.
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   133
    AC_MSG_CHECKING([for appropriate number of jobs to run in parallel])
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   134
    # Approximate memory in GB.
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   135
    memory_gb=`expr $MEMORY_SIZE / 1024`
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   136
    # Pick the lowest of memory in gb and number of cores.
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   137
    if test "$memory_gb" -lt "$NUM_CORES"; then
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   138
      JOBS="$memory_gb"
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   139
    else
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   140
      JOBS="$NUM_CORES"
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   141
    fi
17660
b226baa345a2 8013920: Configure sets JOBS to 0 if memory is too low.
erikj
parents: 17592
diff changeset
   142
    if test "$JOBS" -eq "0"; then
b226baa345a2 8013920: Configure sets JOBS to 0 if memory is too low.
erikj
parents: 17592
diff changeset
   143
      JOBS=1
b226baa345a2 8013920: Configure sets JOBS to 0 if memory is too low.
erikj
parents: 17592
diff changeset
   144
    fi
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   145
    AC_MSG_RESULT([$JOBS])
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   146
  else
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   147
    JOBS=$with_jobs
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   148
  fi
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 14460
diff changeset
   149
  AC_SUBST(JOBS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   150
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   151
34594
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   152
AC_DEFUN_ONCE([BPERF_SETUP_TEST_JOBS],
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   153
[
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   154
  # The number of test jobs will be chosen automatically if TEST_JOBS is 0
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   155
  AC_ARG_WITH(test-jobs, [AS_HELP_STRING([--with-test-jobs],
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   156
      [number of parallel tests jobs to run @<:@based on build jobs@:>@])])
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   157
  if test "x$with_test_jobs" = x; then
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   158
      TEST_JOBS=0
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   159
  else
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   160
      TEST_JOBS=$with_test_jobs
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   161
  fi
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   162
  AC_SUBST(TEST_JOBS)
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   163
])
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34119
diff changeset
   164
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   165
AC_DEFUN([BPERF_SETUP_CCACHE],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   166
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   167
  AC_ARG_ENABLE([ccache],
22474
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   168
      [AS_HELP_STRING([--enable-ccache],
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   169
      [enable using ccache to speed up recompilations @<:@disabled@:>@])])
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   170
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   171
  CCACHE=
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   172
  CCACHE_STATUS=
22474
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   173
  AC_MSG_CHECKING([is ccache enabled])
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   174
  if test "x$enable_ccache" = xyes; then
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   175
    if test "x$TOOLCHAIN_TYPE" = "xgcc" -o "x$TOOLCHAIN_TYPE" = "xclang"; then
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   176
      AC_MSG_RESULT([yes])
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   177
      OLD_PATH="$PATH"
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   178
      if test "x$TOOLCHAIN_PATH" != x; then
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   179
        PATH=$TOOLCHAIN_PATH:$PATH
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   180
      fi
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   181
      BASIC_REQUIRE_PROGS(CCACHE, ccache)
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   182
      PATH="$OLD_PATH"
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   183
      CCACHE_VERSION=[`$CCACHE --version | head -n1 | $SED 's/[A-Za-z ]*//'`]
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   184
      CCACHE_STATUS="Active ($CCACHE_VERSION)"
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   185
    else
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   186
      AC_MSG_RESULT([no])
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   187
      AC_MSG_WARN([ccache is not supported with toolchain type $TOOLCHAIN_TYPE])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   188
    fi
22474
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   189
  elif test "x$enable_ccache" = xno; then
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   190
    AC_MSG_RESULT([no, explicitly disabled])
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   191
    CCACHE_STATUS="Disabled"
22474
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   192
  elif test "x$enable_ccache" = x; then
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   193
    AC_MSG_RESULT([no])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   194
  else
22474
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   195
    AC_MSG_RESULT([unknown])
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   196
    AC_MSG_ERROR([--enable-ccache does not accept any parameters])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   197
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   198
  AC_SUBST(CCACHE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   199
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   200
  AC_ARG_WITH([ccache-dir],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   201
      [AS_HELP_STRING([--with-ccache-dir],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   202
      [where to store ccache files @<:@~/.ccache@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   203
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   204
  if test "x$with_ccache_dir" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   205
    # When using a non home ccache directory, assume the use is to share ccache files
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   206
    # with other users. Thus change the umask.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   207
    SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
22474
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   208
    if test "x$CCACHE" = x; then
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   209
      AC_MSG_WARN([--with-ccache-dir has no meaning when ccache is not enabled])
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   210
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   211
  fi
22474
83fec92ec43d 8027584: Disable ccache by default
ihse
parents: 22467
diff changeset
   212
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   213
  if test "x$CCACHE" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   214
    BPERF_SETUP_CCACHE_USAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   215
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   216
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   217
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   218
AC_DEFUN([BPERF_SETUP_CCACHE_USAGE],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   219
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   220
  if test "x$CCACHE" != x; then
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   221
    if test "x$USE_PRECOMPILED_HEADER" = "x1"; then
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   222
      HAS_BAD_CCACHE=[`$ECHO $CCACHE_VERSION | \
29175
2f9d8f167bd7 8074048: ccache 1.3.10 still not detected properly
srl
parents: 28812
diff changeset
   223
          $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'`]
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   224
      if test "x$HAS_BAD_CCACHE" != "x"; then
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   225
        AC_MSG_ERROR([Precompiled headers requires ccache 3.1.4 or later, found $CCACHE_VERSION])
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   226
      fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   227
      AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers])
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   228
      CCACHE_PRECOMP_FLAG="-fpch-preprocess"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   229
      PUSHED_FLAGS="$CXXFLAGS"
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   230
      CXXFLAGS="$CCACHE_PRECOMP_FLAG $CXXFLAGS"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   231
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   232
      CXXFLAGS="$PUSHED_FLAGS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   233
      if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   234
        AC_MSG_RESULT([yes])
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   235
        CFLAGS_CCACHE="$CCACHE_PRECOMP_FLAG"
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   236
        AC_SUBST(CFLAGS_CCACHE)
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   237
        CCACHE_SLOPPINESS=pch_defines,time_macros
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   238
      else
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   239
        AC_MSG_RESULT([no])
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   240
        AC_MSG_ERROR([Cannot use ccache with precompiled headers without compiler support for $CCACHE_PRECOMP_FLAG])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   241
      fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   242
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   243
28812
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   244
    CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR \
6c36bc1ccc0e 8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents: 26907
diff changeset
   245
        CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS CCACHE_BASEDIR=$TOPDIR $CCACHE"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   246
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   247
    if test "x$SET_CCACHE_DIR" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   248
      mkdir -p $CCACHE_DIR > /dev/null 2>&1
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   249
      chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   250
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   251
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   252
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   253
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   254
################################################################################
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   255
#
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   256
# Runs icecc-create-env once and prints the error if it fails
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   257
#
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   258
# $1: arguments to icecc-create-env
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   259
# $2: log file
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   260
#
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   261
AC_DEFUN([BPERF_RUN_ICECC_CREATE_ENV],
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   262
[
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   263
  cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   264
      && ${ICECC_CREATE_ENV} $1 > $2 2>&1
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   265
  if test "$?" != "0"; then
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   266
    AC_MSG_NOTICE([icecc-create-env output:])
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   267
    cat $2
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   268
    AC_MSG_ERROR([Failed to create icecc compiler environment])
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   269
  fi
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   270
])
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   271
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   272
################################################################################
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   273
#
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   274
# Optionally enable distributed compilation of native code using icecc/icecream
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   275
#
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   276
AC_DEFUN([BPERF_SETUP_ICECC],
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   277
[
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   278
  AC_ARG_ENABLE([icecc], [AS_HELP_STRING([--enable-icecc],
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   279
      [enable distribted compilation of native code using icecc/icecream @<:@disabled@:>@])])
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   280
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   281
  if test "x${enable_icecc}" = "xyes"; then
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   282
    BASIC_REQUIRE_PROGS(ICECC_CMD, icecc)
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   283
    old_path="$PATH"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   284
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   285
    # Look for icecc-create-env in some known places
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   286
    PATH="$PATH:/usr/lib/icecc:/usr/lib64/icecc"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   287
    BASIC_REQUIRE_PROGS(ICECC_CREATE_ENV, icecc-create-env)
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   288
    # Use icecc-create-env to create a minimal compilation environment that can
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   289
    # be sent to the other hosts in the icecream cluster.
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   290
    icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   291
    ${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   292
    # Older versions of icecc does not have the --gcc parameter
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   293
    if ${ICECC_CREATE_ENV} | $GREP -q -e --gcc; then
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   294
      icecc_gcc_arg="--gcc"
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   295
    fi
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   296
    if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   297
      BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${CC} ${CXX}], \
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   298
          ${icecc_create_env_log})
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   299
    elif test "x$TOOLCHAIN_TYPE" = "xclang"; then
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   300
      # For clang, the icecc compilerwrapper is needed. It usually resides next
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   301
      # to icecc-create-env.
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   302
      BASIC_REQUIRE_PROGS(ICECC_WRAPPER, compilerwrapper)
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   303
      BPERF_RUN_ICECC_CREATE_ENV([--clang ${CC} ${ICECC_WRAPPER}], ${icecc_create_env_log})
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   304
    else
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   305
      AC_MSG_ERROR([Can only create icecc compiler packages for toolchain types gcc and clang])
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   306
    fi
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   307
    PATH="$old_path"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   308
    # The bundle with the compiler gets a name based on checksums. Parse log file
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   309
    # to find it.
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   310
    ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   311
    ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}"
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   312
    if test ! -f ${ICECC_ENV_BUNDLE}; then
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   313
      AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}])
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   314
    fi
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   315
    AC_MSG_CHECKING([for icecc build environment for target compiler])
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   316
    AC_MSG_RESULT([${ICECC_ENV_BUNDLE}])
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   317
    ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   318
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   319
    if test "x${COMPILE_TYPE}" = "xcross"; then
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   320
      # If cross compiling, create a separate env package for the build compiler
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   321
      # Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail.
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   322
      icecc_create_env_log_build="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env_build.log"
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   323
      if test "x${BUILD_CC##*/}" = "xgcc" ||  test "x${BUILD_CC##*/}" = "xcc"; then
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   324
        BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${BUILD_CC} ${BUILD_CXX}], \
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   325
            ${icecc_create_env_log_build})
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   326
      elif test "x${BUILD_CC##*/}" = "xclang"; then
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   327
        BPERF_RUN_ICECC_CREATE_ENV([--clang ${BUILD_CC} ${ICECC_WRAPPER}], ${icecc_create_env_log_build})
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   328
      else
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   329
        AC_MSG_ERROR([Cannot create icecc compiler package for ${BUILD_CC}])
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   330
      fi
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   331
      ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log_build}`"
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   332
      ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}"
34867
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   333
      if test ! -f ${ICECC_ENV_BUNDLE}; then
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   334
        AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}])
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   335
      fi
f2b58023ac04 8146091: Configure fails to configure icecc on OEL
erikj
parents: 34594
diff changeset
   336
      AC_MSG_CHECKING([for icecc build environment for build compiler])
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   337
      AC_MSG_RESULT([${ICECC_ENV_BUNDLE}])
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   338
      BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   339
          ICECC_CXX=${BUILD_CXX} ${ICECC_CMD}"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   340
    else
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   341
      BUILD_ICECC="${ICECC}"
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   342
    fi
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   343
    AC_SUBST(ICECC)
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   344
    AC_SUBST(BUILD_ICECC)
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   345
  fi
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   346
])
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   347
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   348
AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   349
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   350
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   351
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   352
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   353
  # Can the C/C++ compiler use precompiled headers?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   354
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   355
  AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   356
      [disable using precompiled headers when compiling C++ @<:@enabled@:>@])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   357
      [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   358
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   359
  USE_PRECOMPILED_HEADER=1
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   360
  AC_MSG_CHECKING([If precompiled header is enabled])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   361
  if test "x$ENABLE_PRECOMPH" = xno; then
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   362
    AC_MSG_RESULT([no, forced])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   363
    USE_PRECOMPILED_HEADER=0
34103
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   364
  elif test "x$ICECC" != "x"; then
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   365
    AC_MSG_RESULT([no, does not work effectively with icecc])
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   366
    USE_PRECOMPILED_HEADER=0
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   367
  else
d03d49538b76 8142983: Enable builds with icecc/icecream
erikj
parents: 34101
diff changeset
   368
    AC_MSG_RESULT([yes])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   369
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   370
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   371
  if test "x$ENABLE_PRECOMPH" = xyes; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   372
    # Check that the compiler actually supports precomp headers.
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22476
diff changeset
   373
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   374
      AC_MSG_CHECKING([that precompiled headers work])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   375
      echo "int alfa();" > conftest.h
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   376
      $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   377
      if test ! -f conftest.hpp.gch; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   378
        USE_PRECOMPILED_HEADER=0
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   379
        AC_MSG_RESULT([no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   380
      else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   381
        AC_MSG_RESULT([yes])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   382
      fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   383
      rm -f conftest.h conftest.hpp.gch
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   384
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   385
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   386
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   387
  AC_SUBST(USE_PRECOMPILED_HEADER)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   388
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   389
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   390
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   391
AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   392
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   393
  AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   394
      [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   395
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   396
  if test "x$with_sjavac_server_java" != x; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   397
    SJAVAC_SERVER_JAVA="$with_sjavac_server_java"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   398
    FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   399
    if test "x$FOUND_VERSION" = x; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   400
      AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   401
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   402
  else
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   403
    SJAVAC_SERVER_JAVA="$JAVA"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   404
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   405
  AC_SUBST(SJAVAC_SERVER_JAVA)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   406
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   407
  if test "$MEMORY_SIZE" -gt "3000"; then
26907
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 26131
diff changeset
   408
    ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
17592
06b7538d17ef 8014514: Fix jvm args for sjavac
erikj
parents: 15790
diff changeset
   409
    if test "$JVM_ARG_OK" = true; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   410
      JVM_64BIT=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   411
      JVM_ARG_OK=false
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   412
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   413
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   414
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   415
  MX_VALUE=`expr $MEMORY_SIZE / 2`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   416
  if test "$JVM_64BIT" = true; then
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   417
    # Set ms lower than mx since more than one instance of the server might
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   418
    # get launched at the same time before they figure out which instance won.
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   419
    MS_VALUE=512
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   420
    if test "$MX_VALUE" -gt "2048"; then
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   421
      MX_VALUE=2048
17592
06b7538d17ef 8014514: Fix jvm args for sjavac
erikj
parents: 15790
diff changeset
   422
    fi
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   423
  else
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   424
    MS_VALUE=256
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   425
    if test "$MX_VALUE" -gt "1500"; then
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   426
      MX_VALUE=1500
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   427
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   428
  fi
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   429
  if test "$MX_VALUE" -lt "512"; then
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   430
    MX_VALUE=512
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   431
  fi
26907
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 26131
diff changeset
   432
  ADD_JVM_ARG_IF_OK([-Xms${MS_VALUE}M -Xmx${MX_VALUE}M],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 26131
diff changeset
   433
  AC_SUBST(SJAVAC_SERVER_JAVA_FLAGS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   434
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   435
  AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   436
      [use sjavac to do fast incremental compiles @<:@disabled@:>@])],
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   437
      [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC="no"])
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   438
  if test "x$JVM_ARG_OK" = "xfalse"; then
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   439
    AC_MSG_WARN([Could not set -Xms${MS_VALUE}M -Xmx${MX_VALUE}M, disabling sjavac])
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   440
    ENABLE_SJAVAC="no"
26131
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   441
  fi
311b5e288cf5 8014510: Fix sjavac on all platforms in jprt
erikj
parents: 23985
diff changeset
   442
  AC_MSG_CHECKING([whether to use sjavac])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   443
  AC_MSG_RESULT([$ENABLE_SJAVAC])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18021
diff changeset
   444
  AC_SUBST(ENABLE_SJAVAC)
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   445
34104
8f2e01846289 8144039: Enable javac server by default
erikj
parents: 34103
diff changeset
   446
  AC_ARG_ENABLE([javac-server], [AS_HELP_STRING([--disable-javac-server],
8f2e01846289 8144039: Enable javac server by default
erikj
parents: 34103
diff changeset
   447
      [disable javac server @<:@enabled@:>@])],
8f2e01846289 8144039: Enable javac server by default
erikj
parents: 34103
diff changeset
   448
      [ENABLE_JAVAC_SERVER="${enableval}"], [ENABLE_JAVAC_SERVER="yes"])
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   449
  if test "x$JVM_ARG_OK" = "xfalse"; then
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   450
    AC_MSG_WARN([Could not set -Xms${MS_VALUE}M -Xmx${MX_VALUE}M, disabling javac server])
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   451
    ENABLE_JAVAC_SERVER="no"
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   452
  fi
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   453
  AC_MSG_CHECKING([whether to use javac server])
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   454
  AC_MSG_RESULT([$ENABLE_JAVAC_SERVER])
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 29790
diff changeset
   455
  AC_SUBST(ENABLE_JAVAC_SERVER)
34101
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
   456
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
   457
  if test "x$ENABLE_JAVAC_SERVER" = "xyes" || "x$ENABLE_SJAVAC" = "xyes"; then
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
   458
    # When using a server javac, the small client instances do not need much
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
   459
    # resources.
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
   460
    JAVA_FLAGS_JAVAC="$JAVA_FLAGS_SMALL"
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
   461
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   462
])