diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-05 12:20:19 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-06 17:57:19 +0100 |
| commit | f3ac50038df0e0739d3bc3da11fdce0dc2939e22 (patch) | |
| tree | 33d7a7d0db4f032e95041468175efbaf15e3ede2 /Makefile.shared | |
| parent | Enhance and clear the support of linker flags (diff) | |
| download | openssl-f3ac50038df0e0739d3bc3da11fdce0dc2939e22.tar.xz openssl-f3ac50038df0e0739d3bc3da11fdce0dc2939e22.zip | |
Display the linking commands that are performed
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.shared b/Makefile.shared index d8bd9ed782..13129f837c 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -95,6 +95,8 @@ LINK_APP= \ LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS) $(LDFLAGS)}"; \ LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ + echo LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS}; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) @@ -105,6 +107,10 @@ LINK_SO= \ SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ + echo LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ $${SHAREDCMD} $${SHAREDFLAGS} \ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ @@ -133,9 +139,9 @@ LINK_SO_O= SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO) LINK_SO_A_VIA_O= \ SHOBJECTS=lib$(LIBNAME).o; \ ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \ - ( $(SET_X); \ + ( echo ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS); \ ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \ - $(LINK_SO) && rm -f lib$(LIBNAME).o + $(LINK_SO) && ( echo rm -f lib$(LIBNAME).o; rm -f lib$(LIBNAME).o ) LINK_SO_A_UNPACKED= \ UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \ |