Commit 8bc0147f authored Feb 22, 2018 by Richard Levitte

Build files: when using $(CPP), use the C flags alongside the CPP flags



The reason for this is that some of the C flags affect built in macros
that we may depend on.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5436)

parent 1af563e3

Configurations/descrip.mms.tmpl

+5 −3

Original line number	Diff line number	Diff line
		@@ -658,9 +658,11 @@ EOF
		die "Generator type for $src unknown: $generator\n";
		}

		my $cppflags = { lib => '$(LIB_CPPFLAGS)',
		dso => '$(DSO_CPPFLAGS)',
		bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};
		my $cppflags = {
		lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',
		dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)',
		bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)'
		} -> {$args{intent}};
		my @incs_cmds = includes({ lib => '$(LIB_INCLUDES)',
		dso => '$(DSO_INCLUDES)',
		bin => '$(BIN_INCLUDES)' } -> {$args{intent}},

Configurations/unix-Makefile.tmpl

+3 −3

Original line number	Diff line number	Diff line
		@@ -850,9 +850,9 @@ EOF
		}

		my $cppflags = {
		lib => '$(LIB_CPPFLAGS)',
		dso => '$(DSO_CPPFLAGS)',
		bin => '$(BIN_CPPFLAGS)'
		lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',
		dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)',
		bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)'
		} -> {$args{intent}};
		if (defined($generator)) {
		# If the target is named foo.S in build.info, we want to

Configurations/windows-makefile.tmpl

+5 −3

Original line number	Diff line number	Diff line
		@@ -436,9 +436,11 @@ EOF
		}

		my $cppflags = $incs;
		$cppflags .= { lib => '$(LIB_CPPFLAGS)',
		dso => '$(DSO_CPPFLAGS)',
		bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};
		$cppflags .= {
		lib => ' $(LIB_CFLAGS) $(LIB_CPPFLAGS)',
		dso => ' $(DSO_CFLAGS) $(DSO_CPPFLAGS)',
		bin => ' $(BIN_CFLAGS) $(BIN_CPPFLAGS)'
		} -> {$args{intent}};
		if (defined($generator)) {
		# If the target is named foo.S in build.info, we want to
		# end up generating foo.s in two steps.