From c74102ef98146321d8d1cc08ca38949a47b9a15f Mon Sep 17 00:00:00 2001 From: Dominic Della Valle Date: Mon, 12 Feb 2018 15:28:13 -0500 Subject: [PATCH] Add Cygwin awareness in make License: MIT Signed-off-by: Dominic Della Valle --- bin/Rules.mk | 5 +++++ bin/dist_get | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/Rules.mk b/bin/Rules.mk index 1a1dd79626e5..073bfb53ab64 100644 --- a/bin/Rules.mk +++ b/bin/Rules.mk @@ -15,8 +15,13 @@ DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp PATH := $(realpath $(d)):$(PATH) $(TGTS_$(d)): + rm -f $@$(binpostfix) +ifeq ($(OS),Windows_NT) + cp $^$(binpostfix) $@$(binpostfix) +else ln -s $(notdir $^)$(binpostfix) $@$(binpostfix) +endif bin/gx-v%: @echo "installing gx $(@:bin/gx-%=%)" diff --git a/bin/dist_get b/bin/dist_get index 1dfe9ce0d2c3..6577b44d208e 100755 --- a/bin/dist_get +++ b/bin/dist_get @@ -58,8 +58,9 @@ unarchive() { ua_outfile="$3" ua_distname="$4" ua_binpostfix="" + ua_os=$(uname -o) - if [ "$(uname -o)" = "Msys" ]; then + if [ "$ua_os" = "Msys" ] || [ "$ua_os" = "Cygwin" ] ; then ua_binpostfix=".exe" fi ua_outfile="$ua_outfile$ua_binpostfix"