diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-09-04 06:00:55 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-09-05 20:02:17 +0000 |
| commit | 9ee01c424e37f7cd76d2edf38e9bc5f6e988d18d (patch) | |
| tree | 984aaa9acb6b738e2453ba3497023aee6c5412d7 /solenv | |
| parent | fdc867a4bc6ac2810732af898c620a889cde725c (diff) | |
gbuild: remove hardlink deliver
Since there's hardly any 'deliver' going on anymore...
Change-Id: Id349958d299c9742382d37deab2125bc09930c14
Reviewed-on: https://gerrit.libreoffice.org/28655
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Deliver.mk | 14 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
2 files changed, 1 insertions, 17 deletions
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index ca609d9f771e..a3e85f30cb34 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -19,16 +19,6 @@ 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, if 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 := gb_Deliver_DELIVERABLES_INDEX := @@ -51,16 +41,14 @@ endif endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && $(TOUCH) -hr $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -P -f $(1) $(2) && $(TOUCH) -hr $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) -ifeq ($(strip $(gb_Deliver_HARDLINK)),) define gb_Deliver__deliver $(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)),\ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index c6237709b367..f98ce8185899 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -114,10 +114,6 @@ ENABLE_DEBUGINFO_FOR := all endif endif -ifeq ($(HARDLINKDELIVER),TRUE) -gb_Deliver_HARDLINK := $(true) -endif - # note: ENABLE_CRASHDUMP turns on gb_SYMBOL ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),) gb_SYMBOL := $(true) |