diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-05-16 17:08:13 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-05-16 18:03:40 +0200 |
| commit | 8f41ff2d53eb43046012c7843f1f1e213b3650ea (patch) | |
| tree | 8ca86d5b0fa6b29ed9ba1cd9f99daf682c605ed7 /Configurations/unix-Makefile.tmpl | |
| parent | 3c01ed680e49f62d90d61ccf7a5802d74f1c342d (diff) | |
Add support for RC / WINDRES env variables
RT#2558
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index a31867ed32..de20ad7d06 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -169,7 +169,6 @@ LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag} # $prefix is not /usr. . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} -RCFLAGS={- $target{shared_rcflag} -} DSO_CFLAGS={- $target{shared_cflag} || "" -} DSO_LDFLAGS=$(LIB_LDFLAGS) BIN_CFLAGS={- $target{bin_cflags} -} @@ -180,6 +179,8 @@ ARFLAGS= {- $target{arflags} -} AR=$(CROSS_COMPILE){- $target{ar} || "ar" -} $(ARFLAGS) r RANLIB= {- $target{ranlib} -} NM= $(CROSS_COMPILE){- $target{nm} || "nm" -} +RCFLAGS={- $target{shared_rcflag} -} +RC= $(CROSS_COMPILE){- $target{rc} || "windres" -} RM= rm -f RMDIR= rmdir TAR= {- $target{tar} || "tar" -} @@ -959,9 +960,9 @@ $target: $lib$libext $deps $ordinalsfile LIBNAME=$libname LIBVERSION=\$(SHLIB_MAJOR).\$(SHLIB_MINOR) \\ LIBCOMPATVERSIONS=';\$(SHLIB_VERSION_HISTORY)' \\ CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(LIB_CFLAGS)' \\ - CROSS_COMPILE='\$(CROSS_COMPILE)' LDFLAGS='\$(LDFLAGS)' \\ + LDFLAGS='\$(LDFLAGS)' \\ SHARED_LDFLAGS='\$(LIB_LDFLAGS)' SHLIB_EXT=$shlibext \\ - SHARED_RCFLAGS='\$(RCFLAGS)' \\ + RC='\$(RC)' SHARED_RCFLAGS='\$(RCFLAGS)' \\ link_shlib.$shlib_target EOF . (windowsdll() ? <<"EOF" : ""); |