diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-17 10:28:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-17 13:20:24 +0100 |
| commit | f876fdd1c0ca11dc81832e05b7203987c0c80558 (patch) | |
| tree | 8086c38a5ff816e30cd6333bba320035fb55f7aa /sw | |
| parent | b122aae83e0fb29cbf36d536ace69c0bb39beb54 (diff) | |
Check OS_FOR_BUILD for behavior of sed executed during build
Follow-up to d8106b6db488a4439f7bb781920c92a056b91ba6 "Non-standard sed -i
option is different on macOS than with GNU sed", thanks to mst for spotting it.
Change-Id: Ida51cfa7c4dd216a5164df4f8143ac89cf2c6b7f
Reviewed-on: https://gerrit.libreoffice.org/66498
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CustomTarget_generated.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk index 94ffb5e1aaa0..e3c266b52665 100644 --- a/sw/CustomTarget_generated.mk +++ b/sw/CustomTarget_generated.mk @@ -26,8 +26,8 @@ $(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens --class-name=TextBlockTokens --word-array-name=textBlockList --enum $(sw_INC)/TextBlockTokens.gperf $(GPERF) --compare-strncmp --readonly-tables -T $(sw_INC)/BlockListTokens.gperf \ --class-name=BlockListTokens --word-array-name=blockListList >> $(sw_INC)/tokens.cxx - sed -i $(if $(filter MACOSX,$(OS)),'') -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(sw_INC)/tokens.cxx - sed -i $(if $(filter MACOSX,$(OS)),'') -e "/^#line/d" $(sw_INC)/tokens.cxx + sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(sw_INC)/tokens.cxx + sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "/^#line/d" $(sw_INC)/tokens.cxx $(call gb_CustomTarget_get_target,sw/generated) : $(sw_INC)/tokens.cxx |