Commit 4e16885c authored by Richard Levitte's avatar Richard Levitte
Browse files

Add support for RC / WINDRES env variables 



RT#2558

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 57f115e9

Configure

+3 −0
Original line number Diff line number Diff line
@@ -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";

		}

Makefile.org

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ EXE_EXT= 
ARFLAGS=

AR=ar $(ARFLAGS) r

RANLIB= ranlib

RC= windres

NM= nm

PERL= perl

TAR= tar
@@ -208,6 +209,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ 
		CC='$(CC)' CFLAG='$(CFLAG)' 			\

		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\

		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		RC='$(RC)'              			\

		CROSS_COMPILE='$(CROSS_COMPILE)'	\

		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\

Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ link_a.cygwin: 
	fi; \

	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \

	$(PERL) util/mkrc.pl $$dll_name | \

		$(CROSS_COMPILE)windres -o rc.o; \

		$(RC) -o rc.o; \

	extras="$$extras rc.o"; \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \