diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-09-17 15:56:42 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-09-17 15:56:42 +0000 |
| commit | 52702f6f9255fb59001153f9885889db1eafd6b6 (patch) | |
| tree | f104a1d8878c0532eaab9ef1035e51a56365c657 /Makefile.shared | |
| parent | 05794d983f7758a168bf8459ca384ece38e5dc45 (diff) | |
| download | openssl-52702f6f9255fb59001153f9885889db1eafd6b6.tar.gz | |
Updates to build system from FIPS branch. Make fipscanisterbuild work and
build FIPS test programs.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.shared b/Makefile.shared index c6006f70bf..3183436ac6 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -101,15 +101,13 @@ LINK_SO= \ 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} $${SHAREDFLAGS} \ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ - ) && $(SYMLINK_SO); \ - ( $(SET_X); rm -f lib$(LIBNAME).exp ) + ) && $(SYMLINK_SO) SYMLINK_SO= \ if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \ @@ -202,8 +200,10 @@ link_app.bsd: # to use native NSModule(3) API and refers to dlfcn as termporary hack. link_o.darwin: @ $(CALC_VERSIONS); \ - SHLIB=lib$(LIBNAME); \ - SHLIB_SUFFIX=.so; \ + SHLIB=`expr "$$THIS" : '.*/\([^/\.]*\)\.'`; \ + SHLIB=$${SHLIB:-lib$(LIBNAME)}; \ + SHLIB_SUFFIX=`expr "$$THIS" : '.*\(\.[^\.]*\)$$'`; \ + SHLIB_SUFFIX=$${SHLIB_SUFFIX:-.so}; \ ALLSYMSFLAGS='-all_load'; \ NOALLSYMSFLAGS=''; \ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \ |