diff options
| author | Wojciech Kaluza <w-kaluza@tlen.pl> | 2019-04-21 12:14:34 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-05-02 11:17:00 +0200 |
| commit | 1e8ae82e2cc25e9a4d877d387e06796c829e4694 (patch) | |
| tree | e6043086ec4740cbdb629dad5f33ad5beffc78b6 /Configurations | |
| parent | 7216e9a20aee620d85185a6ddb8caa30f11f2192 (diff) | |
Add RCFLAGS variable in Windows build file, and use it
- Allow user-defined RCFLAGS
- Pass RCFLAGS to RC
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8803)
(cherry picked from commit a583172dac8bce37e268943e570968f193e8b64b)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index d420bfff34..8ef70b8699 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -187,6 +187,7 @@ AS={- $config{AS} -} ASFLAGS={- join(' ', @{$config{ASFLAGS}}) -} RC={- $config{RC} -} +RCFLAGS={- join(' ', @{$config{RCFLAGS}}) -} ECHO="$(PERL)" "$(SRCDIR)\util\echo.pl" @@ -586,7 +587,7 @@ EOF if ($srcs[0] =~ /\.rc$/) { return <<"EOF"; $args{obj}: $deps - \$(RC) \$(RCOUTFLAG)\$\@ $srcs + \$(RC) \$(RCFLAGS) \$(RCOUTFLAG)\$\@ $srcs EOF } (my $obj = $args{obj}) =~ s|\.o$||; |