diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-05 11:47:14 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-06 17:57:19 +0100 |
| commit | c86ddbe61323e371f6ac88728581481a1aa6f0e6 (patch) | |
| tree | 1cc940589c78f16480486d89223fb2a2775ac470 /Makefile.in | |
| parent | b438f0ed8f3ff1df59698b868e7bdbdaa215e7e1 (diff) | |
Enhance and clear the support of linker flags
Some time ago, we had a ex_libs configuration setting that could be
divided into lflags and ex_libs. These got divided in two settings,
lflags and ex_libs, and the former was interpreted to be general
linking flags.
Unfortunately, that conclusion wasn't entirely accurate. Most of
those linking were meant to end up in a very precise position on the
linking command line, just before the spec of libraries the linking
depends on.
Back to the drawing board, we're diving things further, now having
lflags, which are linking flags that aren't depending on command line
position, plib_lflags, which are linking flags that should show up just
before the spec of libraries to depend on, and finally ex_libs, which
is the spec of extra libraries to depend on.
Also, documentation is changed in Configurations/README. This was
previously forgotten.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 85685c52e9..b4b5f0dac5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,8 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} CC= $(CROSS_COMPILE){- $target{cc} -} CFLAG= {- $config{cflags} -} DEPFLAG= {- $config{depflags} -} -LDFLAGS= {- $config{lflags} -} +LDFLAG= {- $config{lflags} -} +PLIB_LDFLAG= {- $config{plib_lflags} -} EX_LIBS= {- $config{ex_libs} -} EXE_EXT= {- $target{exe_extension} -} ARFLAGS= {- $target{arflags} -} @@ -159,7 +160,7 @@ LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) SHARED_SSL=libssl$(SHLIB_EXT) SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' if (!$config{no_shared}) -} -SHARED_LDFLAGS={- $target{shared_ldflag} -} +SHARED_LDFLAG={- $target{shared_ldflag} -} GENERAL= Makefile BASENAME= openssl @@ -209,11 +210,12 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \ LIBDIR='$(LIBDIR)' \ DEPFLAG='$(DEPFLAG)' \ - SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \ + SHARED_LDFLAG='$(SHARED_LDFLAG)' \ ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ - LDFLAGS='$(LDFLAGS)' EX_LIBS='$(EX_LIBS)' \ + LDFLAG='$(LDFLAG)' \ + PLIB_LDFLAG='$(PLIB_LDFLAG)' EX_LIBS='$(EX_LIBS)' \ CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ |