diff options
| author | Martin Storsjö <martin@martin.st> | 2021-05-15 00:42:38 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2021-06-18 11:19:02 +0300 |
| commit | f9626d1065c43f1d51afe66bdf988b9f33729440 (patch) | |
| tree | 5728dd1aed23dd1269673c6f4b6ad5d9b13e4d18 /ffbuild | |
| parent | 604924a069735f3f1fd56b5dd125e68d402f15ba (diff) | |
| download | ffmpeg-f9626d1065c43f1d51afe66bdf988b9f33729440.tar.gz | |
ffbuild: Avoid using the --preprocessor argument to windres
Instead use --preprocessor-arg; in binutils 2.36, the --preprocessor
flag was changed so that it no longer accepts a string containing
multiple arguments, but the whole --preprocessor argument is
treated as the path to the preprocessor executable (where the path
can contain spaces).
It's currently unclear whether this behaviour will stay or if it
is going to be reverted in the future, see discussion at [1]. Just
to be safe, avoid using the --preprocessor argument. Don't redeclare
the full preprocessing command, but just add the $(CC_DEPFLAGS) options.
Based on a patch by Kyle Schwartz.
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=27594
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'ffbuild')
| -rw-r--r-- | ffbuild/common.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 32f5b997b5..5d8f3dfc1f 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -90,7 +90,7 @@ COMPILE_MSA = $(call COMPILE,CC,MSAFLAGS) -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) %.o: %.rc - $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $< + $(WINDRES) $(IFLAGS) $(foreach ARG,$(CC_DEPFLAGS),--preprocessor-arg "$(ARG)") -o $@ $< %.i: %.c $(CC) $(CCFLAGS) $(CC_E) $< |