Commit fb174faa authored by Richard Levitte's avatar Richard Levitte
Browse files

Configure: correct the check of env vars vs command line flags 



The check to detect if env / make variables conflicted with compiler /
linker flags on the configure command line went a little too far, and
would stop the configuration process if any such command line flag was
given, with no regard for the env / make variables at all.

This change refines the check so the stop only gets triggered if any
such flags were given AND any of the corresponding variables are set.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5561)
parent 2bd3b626

Configure

+19 −4
Original line number Diff line number Diff line
@@ -891,14 +891,29 @@ while (@argvcopy) 
		}

	}



# If any %useradd entry has been set, we must check that the environment

# variables haven't been set.  We start by checking of any %useradd entry

# is set.

if (grep { scalar @$_ > 0 } values %useradd) {

    my $detected_env = join(', ', grep { @{$useradd{$_}} || env($_) }

                                  sort keys %useradd);

    if ($detected_env) {

    # Hash of env / make variables names.  The possible values are:

    # 1 - environment set

    # 2 - %useradd entry set

    # 3 - both set

    my %detected_env =

        map { my $v = 0;

              $v += 1 if env($_);

              $v += 2 if @{$useradd{$_}};

              $_ => $v }

        keys %useradd;



    # If any of the corresponding environment variables is set, we error

    if (grep { $_ & 1 } values %detected_env) {

        my $names = join(', ', grep { $detected_env{$_} > 0 }

                               sort keys %detected_env);

        die <<"_____";

***** Mixing env / make variables and additional compiler/linker flags as

***** configure command line option is not permitted.

***** Affected env / make variables: $detected_env

***** Affected env / make variables: $names

_____

    }

}