Преглед изворни кода

[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 пре 15 година
родитељ
комит
e8b6077566
2 измењених фајлова са 6 додато и 6 уклоњено
  1. 2
    2
      src/Makefile
  2. 4
    4
      src/Makefile.housekeeping

+ 2
- 2
src/Makefile Прегледај датотеку

71
 # If no architecture is specified in Config or on the command-line,
71
 # If no architecture is specified in Config or on the command-line,
72
 # use that of the build machine.
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
 # handle x86_64 like i386, but set -m32 option for 32bit code only
76
 # handle x86_64 like i386, but set -m32 option for 32bit code only
77
 ifeq ($(ARCH),x86_64)
77
 ifeq ($(ARCH),x86_64)
98
 
98
 
99
 # Embedded image, if present
99
 # Embedded image, if present
100
 #
100
 #
101
-EMBEDDED_IMAGE	?= /dev/null
101
+EMBEDDED_IMAGE	 = /dev/null
102
 
102
 
103
 ifneq ($(NO_WERROR),1)
103
 ifneq ($(NO_WERROR),1)
104
 CFLAGS		+= -Werror
104
 CFLAGS		+= -Werror

+ 4
- 4
src/Makefile.housekeeping Прегледај датотеку

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

Loading…
Откажи
Сачувај