summaryrefslogtreecommitdiffstats
path: root/Configurations/shared-info.pl
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-01-26 19:56:44 +0100
committerRichard Levitte <levitte@openssl.org>2018-01-28 07:26:11 +0100
commit5b18235a186dd28ec7a37ed95e29f4ab61f2bcbe (patch)
tree8a47daad7d6f64c43fa78a696f90ce6db1c08432 /Configurations/shared-info.pl
parent8c3bc594e0c74926bfefb84b8bae8a2fac82e465 (diff)
Processing GNU-style "make variables" - implementation
Support the following "make variables": AR (GNU compatible) ARFLAGS (GNU Compatible) AS (GNU Compatible) ASFLAGS (GNU Compatible) CC (GNU Compatible) CFLAGS (GNU Compatible) CXX (GNU Compatible) CXXFLAGS (GNU Compatible) CPP (GNU Compatible) CPPFLAGS (GNU Compatible) CPPDEFINES List of CPP macro definitions. Alternative for -D CPPINCLUDES List of CPP inclusion directories. Alternative for -I HASHBANGPERL Perl invocation to be inserted after '#!' in public perl scripts. LDFLAGS (GNU Compatible) LDLIBS (GNU Compatible) RANLIB Program to generate library archive index RC Program to manipulate Windows resources RCFLAGS Flags for $(RC) RM (GNU Compatible) Setting one of these overrides the corresponding data from our config targets. However, flags given directly on the configuration command line are additional, and are therefore added to the flags coming from one of the variables above or the config target. Fixes #2420 Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5177)
Diffstat (limited to 'Configurations/shared-info.pl')
-rw-r--r--Configurations/shared-info.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index c5ebfc6e37..d3e6941eb6 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -13,12 +13,12 @@
sub detect_gnu_ld {
my @lines =
- `$config{cross_compile_prefix}$target{cc} -Wl,-V /dev/null 2>&1`;
+ `$config{cross_compile_prefix}$config{cc} -Wl,-V /dev/null 2>&1`;
return grep /^GNU ld/, @lines;
}
sub detect_gnu_cc {
my @lines =
- `$config{cross_compile_prefix}$target{cc} -v 2>&1`;
+ `$config{cross_compile_prefix}$config{cc} -v 2>&1`;
return grep /gcc/, @lines;
}