diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-27 10:40:40 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-27 10:40:40 +0100 |
| commit | 3e1e2b6687b0259ae28441cc0d314de0d908776b (patch) | |
| tree | a37ff75a1d80aaa459cd1bbf153e0c36d8d25c15 /solenv/gbuild | |
| parent | 8067be0721462079c1d91bff9865ba07bfc56b5a (diff) | |
gbuild: MacOSX: use tr instead of sed for newlines
At least on tinderbox MacOSX-x86_64@49-TDF the sed appears to ignore the
literal newline character, which is unfortunate, particularly since it
worked on the Jenkins builder.
Blind fix to replace this with a tr invocation that already appears to
work in Zip.mk.
Change-Id: I7a77e69774b050a018b12c73ddd9eff849c33a86
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index e9c2b485d4ec..b3e451bfcd74 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -110,7 +110,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist)))) && \ - cat $${FILELIST} | sed 's/ /\$(NEWLINE)/g' | grep -v '^$$' > $${FILELIST}.1 && \ + cat $${FILELIST} | tr "[:space:]" "\n" | grep -v '^$$' > $${FILELIST}.1 && \ mv $${FILELIST}.1 $${FILELIST} && \ $(if $(CXXOBJECTS)$(OBJCXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ |