diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-05-19 02:08:01 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-05-19 02:08:01 +0000 |
| commit | 0bc9920ad4862ec0eccc36017b8797efe044026d (patch) | |
| tree | 0f79b339d18cc04d698e8c81e714a29b5f0b306f | |
| parent | 3f516ce837aabadfe308fef9992cb4854231e3be (diff) | |
| download | openssl-0bc9920ad4862ec0eccc36017b8797efe044026d.tar.gz | |
Stringify substitutions [some shells require it].
| -rw-r--r-- | Makefile.shared | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.shared b/Makefile.shared index 5afd419f9a..61976210c7 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -68,7 +68,7 @@ LIBDEPS= # The rest is private to this makefile. SET_X=: -#SET_X=set -x +SET_X=set -x top: echo "Trying to use this makefile interactively? Don't." @@ -89,21 +89,23 @@ CALC_VERSIONS= \ LINK_APP= \ ( $(SET_X); \ - LIBDEPS=$${LIBDEPS:-$(LIBDEPS)}; \ - 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`; \ + 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); \ |