Makefile

@@ -10,14 +10,6 @@ else
 MTAG="-m"
 endif
 
-# If available, one may build 'garbled' binaries
-# See https://github.com/burrowers/garble.git
-ifeq ($(GARBLE),y)
-GO=garble -literals -tiny -debugdir=garbled
-else
-GO=go
-endif
-
 ifneq ($(VENDOR),)
 GOBUILDOPTS :=-v -mod vendor
 VTAG = "-v"
@@ -71,7 +63,7 @@ tools:
 
 
 common:
-	$(GO) build .
+	go build .
 	go install .
 
 

logger/Makefile

@@ -2,14 +2,8 @@
 
 EXE = $(notdir $(shell pwd))
 
-ifeq ($(GARBLE),y)
-GO=garble -literals -tiny -debugdir=garbled
-else
-GO = go
-endif
-
 all:
-	$(GO) build .
+	go build .
 
 clean:
 	$(RM) $(EXE) $(EXE).exe

spinsult/Makefile

@@ -1,18 +1,11 @@
 .PHONY: info clean lib
 
-ifeq ($(GARBLE),y)
-GO = garble -literals -tiny -debugdir=garbled
-else
-GO = go
-endif
-
 all: lib
 
 clean:
 	go clean .
 
 lib: info
-	$(GO) build .
 	go install .
 
 ifneq ($(MSYSTEM),)

xs/Makefile

@@ -1,17 +1,11 @@
 .PHONY: clean all vis lint
 
-ifeq ($(GARBLE),y)
-GO = garble -literals -tiny -debugdir=garbled
-else
-GO = go
-endif
-
 EXTPKGS = bytes,errors,flag,fmt,internal,io,log,net,os,path,runtime,time,strings,sync,syscall,binary,encoding
 EXE = $(notdir $(shell pwd))
 
 all:
 	echo "BUILDOPTS:" $(BUILDOPTS)
-	$(GO) build $(BUILDOPTS) .
+	go build $(BUILDOPTS) .
 
 clean:
 	$(RM) $(EXE) $(EXE).exe

xsd/Makefile

@@ -1,16 +1,10 @@
 .PHONY: clean all vis lint
 
-ifeq ($(GARBLE),y)
-GO = garble -literals -tiny -debugdir=garbled
-else
-GO = go
-endif
-
 EXTPKGS = binary,bytes,crypto,encoding,errors,flag,fmt,internal,io,log,net,os,path,runtime,time,strings,sync,syscall
 EXE = $(notdir $(shell pwd))
 
 all:
-	$(GO) build $(BUILDOPTS) .
+	go build $(BUILDOPTS) .
 
 clean:
 	$(RM) $(EXE) $(EXE).exe

xsnet/Makefile

@@ -1,18 +1,12 @@
 .PHONY: info clean lib
 
-ifeq ($(GARBLE),y)
-GO = garble -tiny -literals -debugdir=garbled
-else
-GO = go
-endif
-
 all: lib
 
 clean:
 	go clean .
 
 lib: info
-	$(GO) install .
+	go install .
 
 ifneq ($(MSYSTEM),)
 info:

xspasswd/Makefile

@@ -1,16 +1,10 @@
 .PHONY: clean all vis lint
 
-ifeq ($(GARBLE),y)
-GO = garble -tiny -literals -debugdir=garbled
-else
-GO = go
-endif
-
 EXTPKGS = bytes,errors,flag,fmt,internal,io,log,net,os,path,runtime,time,strings,sync,syscall,binary,encoding
 EXE = $(notdir $(shell pwd))
 
 all:
-	$(GO) build $(BUILDOPTS) .
+	go build $(BUILDOPTS) .
 
 clean:
 	$(RM) $(EXE) $(EXE).exe