diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-03-08 00:16:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-03-08 17:24:02 +0100 |
| commit | 150624bcf54c285183f596976641d57e3cb9a52f (patch) | |
| tree | 2d0aa587391ad4f2d3d0f0ee68436d48fc2f2b79 | |
| parent | 2ab92ae9dca7c4a9dc3b8468333b10aff7629c5a (diff) | |
Configure et al: get rid of last traces of plib_lflags / PLIB_LDFLAGS
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
| -rw-r--r-- | Configurations/README | 10 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 6 | ||||
| -rwxr-xr-x | Configure | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/Configurations/README b/Configurations/README index 8d32a254a2..b51c1df818 100644 --- a/Configurations/README +++ b/Configurations/README @@ -85,8 +85,6 @@ In each table entry, the following keys are significant: lflags => Flags that are used when linking apps. shared_ldflag => Flags that are used when linking shared or dynamic libraries. - plib_lflags => Extra linking flags to appear just before - the libraries on the command line. ex_libs => Extra libraries that are needed when linking. @@ -340,15 +338,15 @@ In each table entry, the following keys are significant: shared libraries: {ld} $(CFLAGS) {shared_ldflag} -shared -o libfoo.so \ -Wl,--whole-archive libfoo.a -Wl,--no-whole-archive \ - {plib_lflags} -lcrypto {ex_libs} + -lcrypto {ex_libs} shared objects: - {ld} $(CFLAGS) {shared_ldflag} -shared -o libeng.so \ - blah1.o blah2.o {plib_lflags} -lcrypto {ex_libs} + {ld} $(CFLAGS) {lflags} {module_lflags} -o libeng.so \ + blah1.o blah2.o -lcrypto {ex_libs} applications: {ld} $(CFLAGS) {lflags} -o app \ - app1.o utils.o {plib_lflags} -lssl -lcrypto {ex_libs} + app1.o utils.o -lssl -lcrypto {ex_libs} Historically, the target configurations came in form of a string with diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 5d30fae927..588c6c11e3 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1100,7 +1100,7 @@ EOF $target: $deps \$(CC) \$(LIB_CFLAGS) $linkflags\$(LIB_LDFLAGS)$shared_soname$shared_imp \\ -o $target_full$shared_def $objs \\ - \$(PLIB_LDFLAGS) $linklibs \$(LIB_EX_LIBS) + $linklibs \$(LIB_EX_LIBS) EOF if (windowsdll()) { $recipe .= <<"EOF"; @@ -1143,7 +1143,7 @@ EOF $target: $objs $deps \$(CC) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\ -o $target $objs \\ - \$(PLIB_LDFLAGS) $linklibs \$(DSO_EX_LIBS) + $linklibs \$(DSO_EX_LIBS) EOF } sub obj2lib { @@ -1191,7 +1191,7 @@ $bin$exeext: $objs $deps rm -f $bin$exeext \$\${LDCMD:-$cmd} $cmdflags $linkflags\$(BIN_LDFLAGS) \\ -o $bin$exeext $objs \\ - \$(PLIB_LDFLAGS) $linklibs \$(BIN_EX_LIBS) + $linklibs \$(BIN_EX_LIBS) EOF } sub in2script { @@ -1101,7 +1101,6 @@ foreach (keys %user) { || $mkvalue->($ref_type, $target{$_}); delete $config{$_} unless defined $config{$_}; } -$config{plib_lflags} = [ $target{plib_lflags} ]; # Allow overriding the build file name $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile"; @@ -3104,7 +3103,6 @@ sub print_table_entry "ld", "lflags", "loutflag", - "plib_lflags", "ex_libs", "bn_ops", "apps_aux_src", |