diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-12 14:40:33 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-12 15:42:33 -0500 |
| commit | 2b91ec7575ca94319a979ed9d23106b061dda095 (patch) | |
| tree | 93d5dab974388f752b8d89820fa142ba7dbe604c /Configure | |
| parent | 577583519b147ec60e8e241ee12471c2a9c53183 (diff) | |
Put user flags last for priority.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -643,7 +643,7 @@ foreach (@argvcopy) else # common if (/^[-+]/), just pass down... { $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; - $user_cflags.=$_." "; + $user_cflags.=" ".$_; } } elsif ($_ =~ /^([^:]+):(.+)$/) @@ -887,10 +887,10 @@ my $no_shared_warn=0; my $no_user_cflags=0; my $no_user_defines=0; -if ($user_cflags ne "") { $config{cflags}="$user_cflags$config{cflags}"; } -else { $no_user_cflags=1; } -if (@user_defines) { $config{defines}=[ @user_defines, @{$config{defines}} ]; } -else { $no_user_defines=1; } +if ($user_cflags ne "") { $config{cflags}="$config{cflags}$user_cflags"; } +else { $no_user_cflags=1; } +if (@user_defines) { $config{defines}=[ @{$config{defines}}, @user_defines ]; } +else { $no_user_defines=1; } # The DSO code currently always implements all functions so that no # applications will have to worry about that from a compilation point @@ -1141,30 +1141,32 @@ if (defined($config{api})) { if ($strict_warnings) { my $wopt; + my $addflags = ''; die "ERROR --strict-warnings requires gcc or clang" unless $ecc eq 'gcc' || $ecc eq 'clang'; foreach $wopt (split /\s+/, $gcc_devteam_warn) { - $config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) + $addflags .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) } if ($ecc eq "clang") { foreach $wopt (split /\s+/, $clang_devteam_warn) { - $config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) + $addflags .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) } } if ($target !~ /^mingw/) { foreach $wopt (split /\s+/, $memleak_devteam_backtrace) { - $config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) + $addflags .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/) } if ($target =~ /^BSD-/) { $config{ex_libs} .= " -lexecinfo"; } } + $config{cflags} = "$addflags $config{cflags}" if $addflags ne ''; } # If we use the unified build, collect information from build.info files |