From 3a55c92bbad0b720c9a3d7a56fa3c351b65a89ee Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 18 Feb 2016 18:43:56 +0100 Subject: 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 --- Makefile.shared | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Makefile.shared') 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: -- cgit v1.2.3