common/autoconf/configure
author ohair
Tue, 18 Sep 2012 11:29:16 -0700
changeset 13697 5262b00bc10c
parent 13132 bd88bb8dd3af
child 14111 2a82ecb35fc7
permissions -rw-r--r--
7197849: Update new build-infra makefiles Reviewed-by: ihse, erikj, ohrstrom, tbell
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
     1
#!/bin/sh
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
     3
CONFIGURE_COMMAND_LINE="$@"
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
     4
conf_script_dir=`dirname $0`
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
     5
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
     6
if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
     7
  conf_custom_script_dir="$conf_script_dir/../../jdk/make/closed/autoconf"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
     8
else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
     9
  conf_custom_script_dir=$CUSTOM_CONFIG_DIR
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    10
fi
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    12
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    13
### Test that the generated configure is up-to-date
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    14
###
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    16
# On Solaris /bin/sh doesn't support test -nt but /usr/bin/test does.
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    17
TEST=`which test`
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    19
print_error_not_up_to_date() {
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    20
  echo "Error: The configure source files is newer than the generated files."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    21
  echo "Please run 'sh autogen.sh' to update the generated files."
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    22
  echo "Note that this test might trigger incorrectly sometimes due to hg timestamps".
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
}
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    25
# NOTE: This test can occasionally go wrong due to the way mercurial handles
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    26
# timestamps. It it supposed to aid during development of build-infra, but should
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    27
# go away before making this the default build system.
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    28
for file in configure.ac *.m4 ; do
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    29
  if $TEST $file -nt generated-configure.sh; then
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    30
    print_error_not_up_to_date
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    31
    exit 1
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
  fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
done
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    35
if $TEST -e $conf_custom_script_dir/generated-configure.sh; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    36
  # If custom source configure is available, make sure it is up-to-date as well.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    37
  for file in configure.ac *.m4 $conf_custom_script_dir/*.m4; do
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    38
    if $TEST $file -nt $conf_custom_script_dir/generated-configure.sh; then
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    39
      print_error_not_up_to_date
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    40
      exit 1
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    41
    fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
  done
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    44
  # Test if open configure is newer than custom configure, if so, custom needs to
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    45
  # be regenerated. This test is required to ensure consistency with custom source.
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    46
  conf_open_configure_timestamp=`grep DATE_WHEN_GENERATED: $conf_script_dir/generated-configure.sh  | cut -d" " -f 3`
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    47
  conf_custom_configure_timestamp=`grep DATE_WHEN_GENERATED: $conf_custom_script_dir/generated-configure.sh  | cut -d" " -f 3`
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    48
  if $TEST $conf_open_configure_timestamp -gt $conf_custom_configure_timestamp; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    49
    echo "Error: The generated configure file contains changes not present in the custom generated file."
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    50
    echo "Please run 'sh autogen.sh' to update the generated files."
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    51
    exit 1
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
  fi
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    53
  
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    54
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    56
# Autoconf calls the configure script recursively sometimes. 
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    57
# Don't start logging twice in that case
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    58
if $TEST "x$conf_debug_configure" = xtrue; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    59
  conf_debug_configure=recursive
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    60
fi
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    61
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    62
### Process command-line arguments
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    63
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    64
conf_processed_arguments=
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    65
conf_openjdk_target=
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    66
conf_extra_cflags=
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    67
conf_extra_cxxflags=
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    68
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    69
for conf_option
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    70
do
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    71
  case $conf_option in
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    72
  --openjdk-target=*)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    73
    conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    74
    continue ;;
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    75
  --with-extra-cflags=*)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    76
    conf_extra_cflags=`expr "X$conf_option" : '[^=]*=\(.*\)'`
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    77
    continue ;;
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    78
  --with-extra-cxxflags=*)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    79
    conf_extra_cxxflags=`expr "X$conf_option" : '[^=]*=\(.*\)'`
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    80
    continue ;;
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    81
  --debug-configure)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    82
    if $TEST "x$conf_debug_configure" != xrecursive; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    83
      conf_debug_configure=true
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    84
      export conf_debug_configure
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    85
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    86
    continue ;;
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    87
  *)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    88
    conf_processed_arguments="$conf_processed_arguments $conf_option" ;;
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    89
  esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    90
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    91
  case $conf_option in
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    92
  -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    93
    conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    94
  -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    95
    conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    96
  -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    97
    conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    98
  esac
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    99
done
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   100
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   101
if $TEST "x$conf_legacy_crosscompile" != "x"; then
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   102
  if $TEST "x$conf_openjdk_target" != "x"; then
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   103
    echo "Error: Specifying --openjdk-target together with autoconf"
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   104
    echo "legacy cross-compilation flags is not supported."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   105
    echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_legacy_crosscompile."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   106
    echo "The recommended use is just --openjdk-target."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   107
    exit 1
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   108
  else
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   109
    echo "Warning: You are using legacy autoconf cross-compilation flags."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   110
    echo "It is recommended that you use --openjdk-target instead."
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   111
    echo ""
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
  fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   113
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   114
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   115
if $TEST "x$conf_openjdk_target" != "x"; then
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   116
  conf_build_platform=`sh $conf_script_dir/build-aux/config.guess`
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   117
  conf_processed_arguments="--build=$conf_build_platform --host=$conf_openjdk_target --target=$conf_openjdk_target $conf_processed_arguments"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   118
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   119
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   120
# Make configure exit with error on invalid options as default.
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   121
# Can be overridden by --disable-option-checking, since we prepend our argument
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   122
# and later options override earlier.
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   123
conf_processed_arguments="--enable-option-checking=fatal $conf_processed_arguments"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   124
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   125
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   126
### Call the configure script
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   127
###
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   128
if $TEST -e $conf_custom_script_dir/generated-configure.sh; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   129
  # Custom source configure available; run that instead
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   130
  echo Running custom generated-configure.sh
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   131
  conf_script_to_run=$conf_custom_script_dir/generated-configure.sh
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   132
else
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   133
  echo Running generated-configure.sh
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   134
  conf_script_to_run=$conf_script_dir/generated-configure.sh
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   135
fi  
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   136
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   137
if $TEST "x$conf_debug_configure" != x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   138
  # Turn on shell debug output if requested (initial or recursive)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   139
  set -x
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
fi
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   141
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   142
if $TEST "x$conf_debug_configure" = xtrue; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   143
  # Turn on logging, but don't turn on twice when called recursive
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   144
  conf_debug_logfile=./debug-configure.log
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   145
  (exec 3>&1 ; (. $conf_script_to_run $conf_processed_arguments --with-extra-cflags="$conf_extra_cflags" --with-extra-cxxflags="$conf_extra_cxxflags" 2>&1 1>&3 ) | tee -a $conf_debug_logfile 1>&2 ; exec 3>&-) | tee -a $conf_debug_logfile
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   146
else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   147
  . $conf_script_to_run $conf_processed_arguments --with-extra-cflags="$conf_extra_cflags" --with-extra-cxxflags="$conf_extra_cxxflags"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   148
fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   149
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   150
conf_result_code=$?
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   151
###
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   152
### Post-processing
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   153
###
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   154
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   155
# Move the log file to the output root, if this was successfully created
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   156
if $TEST -d "$OUTPUT_ROOT"; then
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   157
  mv -f config.log "$OUTPUT_ROOT" 2> /dev/null
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   159
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   160
exit $conf_result_code