diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-22 14:26:40 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-22 14:26:40 +0100 |
| commit | 2b9608b049eb33269f9b900e9e5f1c37fc1a1563 (patch) | |
| tree | f4230c307f3a89bb5e0fc092622762633cac0db9 /Makefile.shared | |
| parent | 180df315c789be1138ce2643583362f4b37c8809 (diff) | |
Fix incorrect SO name on GNU platforms
An error was introduced with the setting of SHLIB in DO_GNU_SO.
A common DO_GNU_SO_COMMON that both DO_GNU_SO and DO_GNU_SO_NOCALC use
makes things clearer.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.shared b/Makefile.shared index 7a89019d4b..743b646185 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -162,13 +162,13 @@ LINK_SO_SHLIB_UNPACKED= \ DETECT_GNU_LD=($(CC) -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null -DO_GNU_SO_NOCALC=\ - SHLIB=$(LIBNAME).so; \ +DO_GNU_SO_COMMON=\ SHLIB_SUFFIX=; \ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" -DO_GNU_SO=$(CALC_VERSIONS); $(DO_GNU_SO_NOCALC); SHLIB=lib$$SHLIB +DO_GNU_SO_NOCALC=SHLIB=$(LIBNAME).so; $(DO_GNU_SO_COMMON) +DO_GNU_SO=SHLIB=lib$$SHLIB; $(CALC_VERSIONS); $(DO_GNU_SO_COMMON) DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBRPATH)" #This is rather special. It's a special target with which one can link |