diff options
| author | Tanzinul Islam <tanzinul.islam@gmail.com> | 2020-11-07 14:11:05 +0000 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-04-19 11:05:54 +0200 |
| commit | 118faf5ffe2ba495407f482a8d8438b7d266815c (patch) | |
| tree | f227f13c9f1fe5445bcdaebe5c144ad05dd37083 /Configurations/windows-makefile.tmpl | |
| parent | 23f3242ffe8613411714eb9350275371059c7bfe (diff) | |
Avoid space between "-I" and include directory
The space is problematic with C++Builder (`bcc32.exe`). MSVC (`cl.exe`)
doesn't care.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 56baa54301..b6fd9149c0 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -229,7 +229,7 @@ CC="{- $config{CC} -}" CPP="{- $config{CPP} -}" CPPFLAGS={- our $cppflags1 = join(" ", (map { "-D".$_} @{$config{CPPDEFINES}}), - (map { " -I ".$_} @{$config{CPPINCLUDES}}), + (map { " -I".$_} @{$config{CPPINCLUDES}}), @{$config{CPPFLAGS}}) -} CFLAGS={- join(' ', @{$config{CFLAGS}}) -} LD="{- $config{LD} -}" @@ -645,8 +645,8 @@ EOF my $gen0 = $args{generator}->[0]; my $gen_args = join('', map { " $_" } @{$args{generator}}[1..$#{$args{generator}}]); - my $gen_incs = join("", map { " -I \"$_\"" } @{$args{generator_incs}}); - my $incs = join("", map { " -I \"$_\"" } @{$args{incs}}); + my $gen_incs = join("", map { " -I\"$_\"" } @{$args{generator_incs}}); + my $incs = join("", map { " -I\"$_\"" } @{$args{incs}}); my $defs = join("", map { " -D".$_ } @{$args{defs}}); my $deps = @{$args{deps}} ? '"'.join('" "', @{$args{generator_deps}}, @{$args{deps}}).'"' : ''; @@ -788,7 +788,7 @@ EOF ( @{$args{srcs}} ); my $srcs = '"'.join('" "', @srcs).'"'; my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"'; - my $incs = join("", map { ' -I "'.$_.'"' } @{$args{incs}}); + my $incs = join("", map { ' -I"'.$_.'"' } @{$args{incs}}); my $defs = join("", map { " -D".$_ } @{$args{defs}}); my $cflags = { shlib => ' $(LIB_CFLAGS)', lib => ' $(LIB_CFLAGS)', |