diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-18 18:43:56 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-19 11:06:54 +0100 |
| commit | 3a55c92bbad0b720c9a3d7a56fa3c351b65a89ee (patch) | |
| tree | 59e5462b3f76ce4de66c9b5dc8243f5d8f632670 /Makefile.shared | |
| parent | 5be5e56c09015633d94fb1ee1290081a78074546 (diff) | |
| download | openssl-3a55c92bbad0b720c9a3d7a56fa3c351b65a89ee.tar.gz | |
Rethink the uplink / applink story
Adding uplink and applink to some builds was done by "magic", the
configuration for "mingw" only had a macro definition, the Configure
would react to its presence by adding the uplink source files to
cpuid_asm_src, and crypto/build.info inherited dance to get it
compiled, and Makefile.shared made sure applink.o would be
appropriately linked in. That was a lot under the hood.
To replace this, we create a few template configurations in
Configurations/00-base-templates.conf, inherit one of them in the
"mingw" configuration, the rest is just about refering to the
$target{apps_aux_src} / $target{apps_obj} in the right places.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.shared b/Makefile.shared index 159e9ecc0e..90290d1883 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -319,10 +319,6 @@ link_a.cygwin: $(LINK_SO_A) || exit 1; \ rm $$extras link_app.cygwin: - @if expr "$(CFLAGS)" : '.*OPENSSL_USE_APPLINK' > /dev/null; then \ - LIBDEPS="$(SRCDIR)/crypto/applink.o $${LIBDEPS:-$(LIBDEPS)}"; \ - export LIBDEPS; \ - fi; \ $(LINK_APP) link_o.alpha-osf1: |