diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-02 10:57:05 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-02 19:15:42 +0100 |
| commit | 2952b9b8115bdd852fb226e918f8b6d6a4a0bea2 (patch) | |
| tree | 0d2c1b02ef9d138dce7719daf2a7bfe8fa91c4e5 /Makefile.in | |
| parent | 9c62a279fecc4ccb95ea55e1ba36470f3eab8775 (diff) | |
| download | openssl-2952b9b8115bdd852fb226e918f8b6d6a4a0bea2.zip openssl-2952b9b8115bdd852fb226e918f8b6d6a4a0bea2.tar.gz openssl-2952b9b8115bdd852fb226e918f8b6d6a4a0bea2.tar.bz2 | |
Don't copy from %target to %config so much, see %config as a complement
We copied $target{cflags}, $target{defines} and a few more to %config,
just to add to the entries. Avoid doing so, and let the build templates
deal with combining the two.
There are a few cases where we still fiddle with %target, but that's
acceptable.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index bddbfdb..4286eb9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,11 +93,11 @@ ENGINESDIR={- use File::Spec::Functions; CROSS_COMPILE= {- $config{cross_compile_prefix} -} CC= $(CROSS_COMPILE){- $target{cc} -} -CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}},"OPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","ENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"")) -} {- $config{cflags} -} +CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -} CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} LDFLAG= {- $config{lflags} -} PLIB_LDFLAG= {- $config{plib_lflags} -} -EX_LIBS= {- $config{ex_libs} -} +EX_LIBS= {- $target{ex_libs} -} {- $config{ex_libs} -} EXE_EXT= {- $target{exe_extension} -} ARFLAGS= {- $target{arflags} -} AR=$(CROSS_COMPILE){- $target{ar} -} $(ARFLAGS) r @@ -196,7 +196,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT) SHARED_SSL=libssl$(SHLIB_EXT) SHARED_LIBS={- $disabled{shared} ? '' : '$(SHARED_CRYPTO) $(SHARED_SSL)' -} SHARED_CFLAG={- $target{shared_cflag} -} -SHARED_LDFLAG={- $target{shared_ldflag} +SHARED_LDFLAG={- $target{shared_ldflag}." ".$config{shared_ldflag} # Unlike other OSes (like Solaris, Linux, Tru64, # IRIX) BSD run-time linkers (tested OpenBSD, NetBSD # and FreeBSD) "demand" RPATH set on .so objects. |