diff options
Diffstat (limited to 'tools/StaticLibrary_ooopathutils.mk')
-rw-r--r-- | tools/StaticLibrary_ooopathutils.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index a656700245ae..b21a0fdbc802 100644 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -34,22 +34,4 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ tools/source/misc/pathutils \ )) - -# HACK for now -# We really should fix the clients of this to link against the static library -# Instead of this evil linking of an object from $(OUTDIR) -define StaticLibrary_ooopathutils_hack -$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1) -$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils),$(1))) - -$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils) - $$(call gb_Deliver_deliver,$$<,$$@) - -endef - -ifeq ($(OS),WNT) -$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.obj)) -else -$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.o)) -endif # vim: set noet sw=4 ts=4: |