summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorDamjan Jovanovic <damjan@apache.org>2018-09-08 08:13:10 +0000
committerDamjan Jovanovic <damjan@apache.org>2018-09-08 08:13:10 +0000
commitf57b17ed4cbe46f05c6c53db73f68ef49d160733 (patch)
tree825f208b9db9b268c2abcd040ddd956b8d5080fb /solenv/gbuild
parent481eb0f00fb4b0dd462835b51aa9d63146685b86 (diff)
Strip carriage returns from the Bison source files.
This hasn't been necessary so far, but dmake did it, so let's be safe. Patch by: me
Notes
Notes: ignore: obsolete
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/LinkTarget.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 78c3f7f021c6..62871966edfb 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -617,7 +617,8 @@ endif
$(call gb_BisonTarget_get_target,$(1),$(2)) : $(call gb_BisonTarget_get_source,$(2))
mkdir -p $(dir $(call gb_BisonTarget_get_target,$(1),$(2))) && \
- bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(call gb_BisonTarget_get_source,$(2))
+ tr -d "\015" < $(call gb_BisonTarget_get_source,$(2)) > $(dir $(call gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir $(call gb_BisonTarget_get_source,$(2))) && \
+ bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(dir $(call gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir $(call gb_BisonTarget_get_source,$(2)))
endef