diff options
author | Richard Levitte <levitte@openssl.org> | 2016-05-16 17:10:16 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-05-17 17:18:25 +0200 |
commit | 4e16885c8c0e28e9586f3abe546cdf976bd21875 (patch) | |
tree | 0a3a13cbf85175f1d919d3e1f1fd9dea21a1fb42 /Configure | |
parent | 57f115e9088fafdc8a65bdf709e9154dded4ab10 (diff) |
Add support for RC / WINDRES env variables
RT#2558
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1254,6 +1254,7 @@ my $shared_extension = $fields[$idx_shared_extension]; my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib]; my $ar = $ENV{'AR'} || "ar"; my $arflags = $fields[$idx_arflags]; +my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres"; my $multilib = $fields[$idx_multilib]; # if $prefix/lib$multilib is not an existing directory, then @@ -1717,12 +1718,14 @@ while (<IN>) s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/; s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/; s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/; + s/^RC=\s*/RC= \$\(CROSS_COMPILE\)/; s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc"; } else { s/^CC=.*$/CC= $cc/; s/^AR=\s*ar/AR= $ar/; s/^RANLIB=.*/RANLIB= $ranlib/; + s/^RC=.*/RC= $windres/; s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc"; s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang"; } |