diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-01-29 22:30:00 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-01-30 07:53:02 +0100 |
| commit | 421e30ec67451ac653e790295a36461a4069d0e4 (patch) | |
| tree | b4b9f7c4388e37c65a0a9cdffecf1a6ee9d699bd /Configure | |
| parent | ea5e0c1caf4ea6731d09edf36a5ae57d6e60cd10 (diff) | |
Configure: Clarify the handling of $thread_cflags
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 17 |
1 files changed, 4 insertions, 13 deletions
@@ -884,7 +884,7 @@ if (!$no_dso && $target{dso_scheme} ne "") $config{cflags} = "$dso_cflags $config{cflags}"; } -my $thread_cflags; +my $thread_cflags = ""; my @thread_defines; if ($target{thread_cflag} ne "(unknown)" && !$no_threads) { @@ -902,21 +902,13 @@ if ($target{thread_cflag} eq "(unknown)" && $threads) print "provide any system-specific compiler options\n"; exit(1); } - $thread_cflags="-DOPENSSL_THREADS $config{cflags}" ; + $thread_cflags="-DOPENSSL_THREADS" ; push @thread_defines, "OPENSSL_THREADS"; } else { - $thread_cflags="-DOPENSSL_THREADS $target{thread_cflag} $config{cflags}"; + $thread_cflags="-DOPENSSL_THREADS $target{thread_cflag}"; push @thread_defines, "OPENSSL_THREADS"; -# my $def; -# foreach $def (split ' ',$target{thread_cflag}) -# { -# if ($def =~ s/^-D// && $def !~ /^_/) -# { -# push @thread_defines, "$def"; -# } -# } } $config{ex_libs}="$libs$config{ex_libs}" if ($libs ne ""); @@ -924,12 +916,11 @@ $config{ex_libs}="$libs$config{ex_libs}" if ($libs ne ""); if ($no_asm) { $config{cflags}=~s/-D[BL]_ENDIAN// if ($config{fips}); - $thread_cflags=~s/-D[BL]_ENDIAN// if ($config{fips}); } if ($threads) { - $config{cflags}=$thread_cflags; + $config{cflags} = "$thread_cflags $config{cflags}" if $thread_cflags; push @{$config{openssl_thread_defines}}, @thread_defines; } |