make gbuild deliver more robust in when using HARDLINK

solenv/gbuild/Deliver.mk

@@ -31,7 +31,12 @@ gb_Deliver_GNUCOPY := $(GNUCOPY)
 # if ($true) then old files will get removed from the target location before
 # they are copied there. In multi-user environments, this is needed you need to
 # be the owner of the target file to be able to modify timestamps
+ifeq ($(strip gb_Deliver_HARDLINK),)
 gb_Deliver_CLEARONDELIVER := $(false)
+else
+gb_Deliver_CLEARONDELIVER := $(true)
+endif
+
 
 define gb_Deliver_init
 gb_Deliver_DELIVERABLES :=
@@ -54,15 +59,17 @@ endif
 
 endef
 
-ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
 define gb_Deliver__deliver
 $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
 endef
-else
+
+ifneq ($(strip $(gb_Deliver_GNUCOPY)),)
+ifeq ($(strip $(gb_Deliver_HARDLINK)),)
 define gb_Deliver__deliver
-$(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) $(if $(gb_Deliver_HARDLINK),--link) --no-dereference --force --preserve=timestamps $(1) $(2)
+$(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --no-dereference --force --preserve=timestamps $(1) $(2)
 endef
 endif
+endif
 
 define gb_Deliver_deliver
 $(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\