Skip to content

K
k3s
Commit 5930c573 authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Remove Makefile undefined variables logic

It didn't do what I thought it did and was just noise. Specifically, it only kicks in for recursive `make` invocations.
parent 8fb8f3d4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 16 deletions
Makefile
View file @ 5930c573
...@@ -36,9 +36,6 @@ SHELL := /bin/bash ...@@ -36,9 +36,6 @@ SHELL := /bin/bash
MAKEFLAGS += --no-builtin-rules MAKEFLAGS += --no-builtin-rules
.SUFFIXES: .SUFFIXES:
# We want make to yell at us if we use undefined variables.
MAKEFLAGS += --warn-undefined-variables
# Constants used throughout. # Constants used throughout.
OUT_DIR ?= _output OUT_DIR ?= _output
BIN_DIR := $(OUT_DIR)/bin BIN_DIR := $(OUT_DIR)/bin
...@@ -47,20 +44,9 @@ PRJ_SRC_PATH := k8s.io/kubernetes ...@@ -47,20 +44,9 @@ PRJ_SRC_PATH := k8s.io/kubernetes
# Metadata for driving the build lives here. # Metadata for driving the build lives here.
META_DIR := .make META_DIR := .make
# export KUBE_GOFLAGS := $(GOFLAGS)
# Define variables that we use as inputs so we can warn about undefined variables.
#
WHAT ?=
TESTS ?=
GOFLAGS ?=
KUBE_GOFLAGS = $(GOFLAGS)
export KUBE_GOFLAGS GOFLAGS
GOLDFLAGS ?= export KUBE_GOLDFLAGS := $(GOLDFLAGS)
KUBE_GOLDFLAGS = $(GOLDFLAGS)
export KUBE_GOLDFLAGS GOLDFLAGS
# Build code. # Build code.
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment