diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-10 09:04:09 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-10 10:02:29 +0100 |
| commit | d46057277f3b805e5f198e31fc81a892bf5c9141 (patch) | |
| tree | 1af8070e94fbdf7cc4b799936380c68000341274 /Configurations/windows-makefile.tmpl | |
| parent | 8cffddc0f2c59768e724a4c8dc68822cfea5cacc (diff) | |
Pass down inclusion directories to source file generators
The source file generators sometimes use $(CC) to post-process
generated source, and getting the inclusion directories may be
necessary at times, so we pass them down.
RT#4406
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 7b78f9f4d9..967146fa29 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -171,6 +171,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure my %args = @_; (my $target = $args{src}) =~ s/\.[sS]$/.asm/; my $generator = join(" ", @{$args{generator}}); + my $incs = join("", map { " /I ".$_ } @{$args{incs}}); if ($target !~ /\.asm$/) { return <<"EOF"; @@ -195,7 +196,7 @@ $target: $args{generator}->[0] set ASM=\$(AS) set CC=\$(CC) $generator \$@.S - \$(CC) \$(CFLAGS) /EP /C \$@.S > \$@ + \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@ del /Q \$@.S EOF } @@ -209,7 +210,7 @@ EOF } return <<"EOF"; $target: $args{generator}->[0] - \$(CC) \$(CFLAGS) /EP /C \$< > \$@ + \$(CC) \$(CFLAGS) $incs /EP /C \$< > \$@ EOF } } |