Commit 1e8ae82e authored Apr 21, 2019 by Wojciech Kaluza Committed by Richard Levitte May 02, 2019

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 a583172d)

parent 7216e9a2

Configurations/windows-makefile.tmpl

+2 −1

Original line number	Diff line number	Diff line
		@@ -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$\|\|;