From: Richard Levitte <levitte@openssl.org>
Date: Mon, 7 Mar 2016 19:43:07 +0000 (+0100)
Subject: Make unified builds the default on Unix
X-Git-Tag: OpenSSL_1_1_0-pre4~261
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=021fff844e0d2e43ac5df03bd3b1afeb7fa4a5e6;p=oweals%2Fopenssl.git

Make unified builds the default on Unix

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index cf50785ceb..b7dcde0b68 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -35,9 +35,6 @@
 	shared_ldflag	=> "",
 	shared_rcflag	=> "",
 	shared_extension	=> "",
-
-	build_scheme	=> "unixmake",
-	build_file	=> "Makefile",
     },
 
     BASE_common => {
@@ -72,7 +69,7 @@
                 }
                 return (); },
 
-        build_scheme    => "unixmake",
+        build_scheme    => [ "unified", "unix" ],
         build_file      => "Makefile",
     },