diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-06-22 23:42:34 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-06-22 23:42:34 +0000 |
| commit | 7858cc03da76afd7bab6bd9c7dde431e8fe048b4 (patch) | |
| tree | 9fbae571bd9a96644c6689fcaf2f132d594f8ca7 /Makefile.shared | |
| parent | bbada3327192ab093a2dff3b0737894d226f7579 (diff) | |
Solaris-specific Makefile.shared update from 098.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.shared b/Makefile.shared index 6f0f5ce4a6..019ebb2864 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -89,21 +89,23 @@ CALC_VERSIONS= \ LINK_APP= \ ( $(SET_X); \ - LIBDEPS=$${LIBDEPS:-$(LIBDEPS)}; \ + LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $${LDCMD:=$(CC)} $${LDFLAGS:=$(CFLAGS)} \ - -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $$LIBDEPS ) + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) LINK_SO= \ ( $(SET_X); \ - LIBDEPS=$${LIBDEPS:-$(LIBDEPS)}; \ + LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ + SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \ LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $${SHAREDCMD:=$(CC)} $${SHAREDFLAGS:=$(CFLAGS) $(SHARED_LDFLAGS)} \ + $${SHAREDCMD} $${SHAREDFLAGS} \ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ ) && $(SYMLINK_SO); \ |