diff options
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 \ |