Commits

Hans-Joachim Lankenau  committed ab0638c

#i10000# workaround limitations of solaris awk

  • Participants
  • Parent commits bc38c93

Comments (0)

Files changed (3)

File solenv/gbuild/Deliver.mk

 endef
 else
 define gb_Deliver_deliver
-mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=mode,timestamps $(1) $(2)
+mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2)
 endef
 endif
 
 ifeq ($$(words $(gb_Module_ALLMODULES)),1)
 $$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1))
 deliverlog : COMMAND := mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) &&
-deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | awk -f $$(GBUILDDIR)/processdelivered.awk > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log
+deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log
 else
 $$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1))
 deliverlog : COMMAND := true

File solenv/gbuild/platform/linux.mk

 gb_CC := gcc
 gb_CXX := g++
 gb_GCCP := gcc
+gb_AWK := awk
 
 # use CC/CXX if they are nondefaults
 ifneq ($(origin CC),default)

File solenv/gbuild/platform/macosx.mk

 gb_CC := $(CC)
 gb_CXX := $(CXX)
 gb_GCCP := $(CC)
+gb_AWK := awk
 
 
 gb_OSDEFS := \