diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-31 19:06:30 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-01 16:39:54 +0100 |
| commit | a626bdd56d7116efa57e65403ad51b56657148c3 (patch) | |
| tree | f48fac9d3e2fe327b59f10c1229eb43a2c3858da /solenv/gbuild | |
| parent | 4bd701a306c8068911203f976145adc717f015d2 (diff) | |
gbuild: rename value OS=IOS to OS=iOS
This gets rid of the horrible hack in gbuild.mk to accomodate the
case-incorrect iOS platform makefiles that cannot be renamed without
upsetting git on file systems that sadly lack the case sensitivity
feature.
Keep the macro defined to IOS though.
Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234
Reviewed-on: https://gerrit.libreoffice.org/62705
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/platform/iOS.mk | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index add0655498b0..bc6d3610daf6 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1330,7 +1330,7 @@ endef # call gb_LinkTarget__use_linktarget_objects,linktarget,linktargets define gb_LinkTarget__use_linktarget_objects $(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget))) -ifneq ($(OS),IOS) +ifneq ($(OS),iOS) $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget))) endif diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index f072736f9c17..0aee4f84776d 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -167,18 +167,7 @@ gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions -# Work around inconsistency in case of $(OS) being "IOS" (all -# upper-case) vs. the file being included here having the name -# iOS_*_*.mk (lower-case 'i'). This went unnoticed until now when I -# happen to build for iOS on a case-sensitive file system. - -ifeq ($(OS),IOS) -gbuildplatformosname=iOS -else -gbuildplatformosname=$(OS) -endif - -include $(GBUILDDIR)/platform/$(gbuildplatformosname)_$(CPUNAME)_$(COM).mk +include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk # this is optional include $(SRCDIR)/RepositoryFixes.mk diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk index 46127c9595bf..6e5e20c0295b 100644 --- a/solenv/gbuild/platform/iOS.mk +++ b/solenv/gbuild/platform/iOS.mk @@ -35,7 +35,7 @@ gb_DEBUGINFO_FLAGS=-g gb_MKTEMP := /usr/bin/mktemp -t gbuild. gb_OSDEFS := \ - -D$(OS) \ + -DIOS \ -D_PTHREADS \ -DUNIX \ -DUNX \ |