Pārlūkot izejas kodu

[makefile] Avoid using ?=

?= in a Makefile means that that variable can be overridden by the
environment.  This is confusing to users, especially with a generic
name like "ARCH".

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
tags/v0.9.5
H. Peter Anvin 16 gadus atpakaļ
vecāks
revīzija
e8b6077566
2 mainītis faili ar 6 papildinājumiem un 6 dzēšanām
  1. 2
    2
      src/Makefile
  2. 4
    4
      src/Makefile.housekeeping

+ 2
- 2
src/Makefile Parādīt failu

@@ -71,7 +71,7 @@ noargs : blib $(BIN)/NIC $(BIN)/gpxe.dsk $(BIN)/gpxe.iso $(BIN)/gpxe.usb $(BIN)/
71 71
 # If no architecture is specified in Config or on the command-line,
72 72
 # use that of the build machine.
73 73
 #
74
-ARCH		?= $(shell uname -m | sed -e s,i[3456789]86,i386,)
74
+ARCH		:= $(shell uname -m | sed -e s,i[3456789]86,i386,)
75 75
 
76 76
 # handle x86_64 like i386, but set -m32 option for 32bit code only
77 77
 ifeq ($(ARCH),x86_64)
@@ -98,7 +98,7 @@ LDFLAGS		+= $(EXTRA_LDFLAGS)
98 98
 
99 99
 # Embedded image, if present
100 100
 #
101
-EMBEDDED_IMAGE	?= /dev/null
101
+EMBEDDED_IMAGE	 = /dev/null
102 102
 
103 103
 ifneq ($(NO_WERROR),1)
104 104
 CFLAGS		+= -Werror

+ 4
- 4
src/Makefile.housekeeping Parādīt failu

@@ -58,16 +58,16 @@ ECHO_E_BIN_ECHO_TAB 	:= $(shell $(ECHO_E_BIN_ECHO) '\t')
58 58
 ECHO_E_BIN_ECHO_E_TAB 	:= $(shell $(ECHO_E_BIN_ECHO_E) '\t')
59 59
 
60 60
 ifeq ($(ECHO_E_ECHO_TAB),$(TAB))
61
-ECHO_E		?= $(ECHO_E_ECHO)
61
+ECHO_E		:= $(ECHO_E_ECHO)
62 62
 endif
63 63
 ifeq ($(ECHO_E_ECHO_E_TAB),$(TAB))
64
-ECHO_E		?= $(ECHO_E_ECHO_E)
64
+ECHO_E		:= $(ECHO_E_ECHO_E)
65 65
 endif
66 66
 ifeq ($(ECHO_E_BIN_ECHO_TAB),$(TAB))
67
-ECHO_E		?= $(ECHO_E_BIN_ECHO)
67
+ECHO_E		:= $(ECHO_E_BIN_ECHO)
68 68
 endif
69 69
 ifeq ($(ECHO_E_BIN_ECHO_E_TAB),$(TAB))
70
-ECHO_E		?= $(ECHO_E_BIN_ECHO_E)
70
+ECHO_E		:= $(ECHO_E_BIN_ECHO_E)
71 71
 endif
72 72
 
73 73
 .echocheck :

Notiek ielāde…
Atcelt
Saglabāt