strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop -I$(dir $(2)) also from gb_*Object__tool_command

Browse source 
...after ecbaf98062 "-I$(dir $(3)) in
gb_CObject__command_pattern is no longer needed" and
f218f8f6c8 "-I$(dir $(3)) in
gb_CObject__command_pattern is no longer needed" had already dropped it from
plain gb_CObject__command_pattern.  (0349c738da
"support for compiler rewriters" had created gb_*Object__tool_command at a time
when plain gb_*Object__command still contained those -I arguments, so had
presumably just copied them over without a specific additional need to have them
in the tool_command variants; and ecbaf98062 and
f218f8f6c8 then just failed to also remove them
from the tool_command variants.)

Presence of the -I arguments in the tool_command variants caused e.g. `make
COMPILER_PLUGIN_TOOL=fakebool` to fail with

> sw/source/filter/ww8/ww8par.cxx:97:10: error: replace <...> include form with "..." for inclusion of a source file next to the current source file, sw/source/filter/ww8/../../core/inc/DocumentRedlineManager.hxx [loplugin:includeform]
> #include <../../core/inc/DocumentRedlineManager.hxx>
>          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: I7ef513507375dcee5d88db53cef58433f7f68e36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94867
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2020-05-26 15:43:07 +02:00
parent 067342f063
commit b149c61ba9
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
solenv/gbuild/LinkTarget.mk
View file

@ -98,7 +98,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CFLAGS) $(T_CFLAGS_APPEND) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
)
endef
@ -114,7 +113,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
)
endef
@ -130,7 +128,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
)
endef
@ -146,7 +143,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
)
endef
@ -162,7 +158,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CXXCLRFLAGS) $(T_CXXCLRFLAGS_APPEND) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
)
endef