diff options
| author | Brian Aker <brian@tangent.org> | 2014-02-07 00:18:45 -0800 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2014-02-07 00:18:45 -0800 |
| commit | f254b2b288f2ee5678a537c578b4bfef6e66a1df (patch) | |
| tree | c6221f01c769b118c344004bb80796f96f369add | |
| parent | 96964f01822cce66cf7abb1e1cc043248503b923 (diff) | |
| download | libmemcached-f254b2b288f2ee5678a537c578b4bfef6e66a1df.tar.gz | |
Update bootstrap.
| -rwxr-xr-x | bootstrap.sh | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index d45c9194..5a7cb779 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1098,7 +1098,11 @@ run_autoreconf () if $use_libtool; then assert $BOOTSTRAP_LIBTOOLIZE - run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE" + if $jenkins_build_environment; then + run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE" + else + run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE" + fi fi run "$AUTORECONF" "$AUTORECONF_ARGS" || die "Cannot execute $AUTORECONF" @@ -1239,7 +1243,11 @@ autoreconf_setup () fi if [[ -z "$GNU_BUILD_FLAGS" ]]; then - GNU_BUILD_FLAGS="--install --force" + if $jenkins_build_environment; then + GNU_BUILD_FLAGS="--install" + else + GNU_BUILD_FLAGS="--install --force" + fi fi if $verbose; then @@ -1557,7 +1565,8 @@ execute_job () check_make_target $target ret=$? if [ $ret -ne 0 ]; then - die "Unknown BOOTSTRAP_TARGET option: $target" + warn "Unknown BOOTSTRAP_TARGET option: $target" + target="jenkins" fi fi @@ -1732,24 +1741,6 @@ main () BOOTSTRAP_TARGET="$OPT_TARGET" fi - # If we are running under Jenkins we predetermine what tests we will run against - # This BOOTSTRAP_TARGET can be overridden by parse_command_line_options based BOOTSTRAP_TARGET changes. - # We don't want Jenkins overriding other variables, so we NULL them. - if [ -z "$BOOTSTRAP_TARGET" ]; then - if $jenkins_build_environment; then - if [[ -n "$JENKINS_TARGET" ]]; then - check_make_target $JENKINS_TARGET - if [ $? -eq 0 ]; then - BOOTSTRAP_TARGET="$JENKINS_TARGET" - else - die "label not found: $label" - fi - else - BOOTSTRAP_TARGET='jenkins' - fi - fi - fi - if [ -z "$BOOTSTRAP_TARGET" ]; then BOOTSTRAP_TARGET="make_default" fi |