summaryrefslogtreecommitdiffstats
path: root/Configurations/unix-Makefile.tmpl
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-04-11 10:11:07 +0200
committerAndy Polyakov <appro@openssl.org>2018-04-12 14:58:53 +0200
commit18d1588268f0fbec249d3386113df4452234573d (patch)
treec20e2762d9043b665b5f63bf4afea3953ce67e02 /Configurations/unix-Makefile.tmpl
parent0652e8a7fe6dd8cbdf4516b221642b10bbfc68fe (diff)
Configurations/*.tmpl: refine build_all_generated.
Purpose of build_all_generated is to execute all the rules that require perl, so that one can copy the tree to system with compiler but without perl. This commit removes last dependencies on perl. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5929)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
-rw-r--r--Configurations/unix-Makefile.tmpl21
1 files changed, 11 insertions, 10 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 46a4866e25..39df5cd184 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -353,6 +353,11 @@ build_apps build_tests: build_programs
# Convenience target to prebuild all generated files, not just the mandatory
# ones
build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
+ @ : {- output_off() if $disabled{makedepend}; "" -}
+ @echo "Warning: consider configuring with no-makedepend, because if"
+ @echo " target system doesn't have $(PERL),"
+ @echo " then make will fail..."
+ @ : {- output_on() if $disabled{makedepend}; "" -}
test: tests
{- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep link-utils
@@ -1000,18 +1005,14 @@ $obj$objext: $deps
$cmd $cmdflags -c -o \$\@ $srcs
EOF
} elsif (grep /\.S$/, @srcs) {
- # In case one wonders why not just $(CC) -c file.S. While it
- # does work with contemporary compilers, there are some legacy
- # ones that get it wrong. Hence the elaborate scheme... We
- # don't care to maintain dependecy lists, because dependency
- # is rather weak, at most one header file that lists constants
- # which are assigned in ascending order.
+ # Originally there was mutli-step rule with $(CC) -E file.S
+ # followed by $(CC) -c file.s. It compensated for one of
+ # legacy platform compiler's inability to handle .S files.
+ # The platform is long discontinued by vendor so there is
+ # hardly a point to drag it along...
$recipe .= <<"EOF";
$obj$objext: $deps
- ( trap "rm -f \$@.*" INT 0; \\
- \$(CC) $incs $cmdflags -E $srcs | \\
- \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.s && \\
- $cmd $cmdflags -c -o \$\@ \$@.s )
+ $cmd $incs $cmdflags -c -o \$\@ $srcs
EOF
} elsif (defined $makedepprog && $makedepprog !~ /\/makedepend/) {
$recipe .= <<"EOF";