diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-06-24 09:29:04 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-06-24 09:31:27 +0200 |
| commit | 1e2831e97beece97a753c40a4d313e9a0662d494 (patch) | |
| tree | 744c7a26b49a5579f4cf7a4787f12e66a4c770e1 | |
| parent | 36d91a65ab2db0c4c81e09771f6b44e1905122a0 (diff) | |
iOS workaround to avoid mkdir problem.
this patch solves:
make -rs -f /Volumes/LIBREOFFICE/ios/core/Makefile.gbuild all
touch: /Volumes/LIBREOFFICE/ios/work/workdir/Executable/cppumaker.run: No such file or directory
make[1]: *** [/Volumes/LIBREOFFICE/ios/work/workdir/Executable/cppumaker.run] Error 1
Seems the touch <foo>.run does not have a mkdir -p.
Change-Id: I3a02f5fd04cc3e2b96afb919542ef708849daf10
| -rw-r--r-- | Makefile.fetch | 1 | ||||
| -rw-r--r-- | codemaker/Module_codemaker.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 25c77f5a02cd..24b9d965d246 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -221,5 +221,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ , $(call fetch_Download_item,https://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) @mkdir -p $(dir $@) && touch $@ + @mkdir -p $(dir $@)/Executable # vim: set noet sw=4 ts=4: diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk index 93a43bbe1b8f..c65d86c390cb 100644 --- a/codemaker/Module_codemaker.mk +++ b/codemaker/Module_codemaker.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,codemaker)) # if not cross-compiling or we need this for ODK ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE))) - +ifneq ($(OS),IOS) $(eval $(call gb_Module_add_targets,codemaker,\ StaticLibrary_codemaker \ StaticLibrary_codemaker_cpp \ @@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,codemaker,\ Executable_javamaker \ Executable_cppumaker \ )) - +endif endif # vim:set noet sw=4 ts=4: |