summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-17 09:09:31 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-17 22:46:14 +0100
commit1f2e1cd5e803c9f69be66b61c9dd2b7feebeb6b4 (patch)
treee0384edbba6a2ad88b86e6475dee9e31b285e621 /Configurations
parent1fbab1dc6fcb14f512a40c5755708a8bcbf84f40 (diff)
Make picker, thread and combine standard config helper functions
Document them as well Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf16
-rw-r--r--Configurations/90-team.conf10
-rw-r--r--Configurations/99-personal-levitte.conf6
3 files changed, 0 insertions, 32 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 5a3a5faa93..87160968ca 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1,22 +1,6 @@
## -*- mode: perl; -*-
## Standard openssl configuration targets.
-sub picker {
- my %opts = @_;
- return sub { add($opts{default} || (),
- $opts{$config{build_type}} || ())->(); }
-}
-
-sub threads {
- my @flags = @_;
- return sub { add($disabled{threads} ? () : @flags)->(); }
-}
-
-sub combine {
- my @stuff = @_;
- return sub { add(@stuff)->(); }
-}
-
# Helper functions for the Windows configs
my $vc_win64a_info = {};
sub vc_win64a_info {
diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf
index c7f287fb23..92f8422454 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -1,16 +1,6 @@
## -*- mode: perl; -*-
## Build configuration targets for openssl-team members
-sub threads {
- my @flags = @_;
- return sub { add($disabled{threads} ? () : @flags)->(); }
-}
-
-sub combine {
- my @stuff = @_;
- return sub { add(@stuff)->(); }
-}
-
%targets = (
"purify" => {
cc => "purify gcc",
diff --git a/Configurations/99-personal-levitte.conf b/Configurations/99-personal-levitte.conf
index d1ddf2ef54..c67252b510 100644
--- a/Configurations/99-personal-levitte.conf
+++ b/Configurations/99-personal-levitte.conf
@@ -1,12 +1,6 @@
## -*- mode: perl; -*-
## Personal configuration targets
-sub picker {
- my %opts = @_;
- return sub { add($opts{default} || (),
- $opts{$config{build_type}} || ())->(); }
-}
-
%targets = (
"levitte-linux-elf" => {
inherit_from => [ "linux-elf" ],