Skip to content

Commit 9422f3e

Browse files
tianhuasjren1
authored andcommitted
Makefile cleanup
replace "=" with "?=", if variable is defined, don't redefine. replace POSTLD with OBJCOPY fix the variable LD assignment Signed-off-by: Tianhua Sun <tianhuax.s.sun@intel.com>
1 parent edcd8f0 commit 9422f3e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

hypervisor/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ INCLUDE_PATH += bsp/include
7070
INCLUDE_PATH += bsp/$(PLATFORM)/include/bsp
7171
INCLUDE_PATH += boot/include
7272

73-
CC = gcc
74-
AS = as
75-
AR = ar
76-
LD = gcc
77-
POSTLD = objcopy
73+
CC ?= gcc
74+
AS ?= as
75+
AR ?= ar
76+
LD ?= ld
77+
OBJCOPY ?= objcopy
7878

7979
D_SRCS += $(wildcard debug/*.c)
8080
C_SRCS += boot/acpi.c
@@ -187,14 +187,14 @@ install: efi
187187
endif
188188

189189
$(HV_OBJDIR)/$(HV_FILE).32.out: $(HV_OBJDIR)/$(HV_FILE).out
190-
$(POSTLD) -S --section-alignment=0x1000 -O elf32-i386 $< $@
190+
$(OBJCOPY) -S --section-alignment=0x1000 -O elf32-i386 $< $@
191191

192192
$(HV_OBJDIR)/$(HV_FILE).bin: $(HV_OBJDIR)/$(HV_FILE).out
193-
$(POSTLD) -O binary $< $(HV_OBJDIR)/$(HV_FILE).bin
193+
$(OBJCOPY) -O binary $< $(HV_OBJDIR)/$(HV_FILE).bin
194194

195195
$(HV_OBJDIR)/$(HV_FILE).out: $(C_OBJS) $(S_OBJS)
196196
$(CC) -E -x c $(patsubst %, -I%, $(INCLUDE_PATH)) $(ARCH_LDSCRIPT_IN) | grep -v '^#' > $(ARCH_LDSCRIPT)
197-
$(LD) -Wl,-Map=$(HV_OBJDIR)/$(HV_FILE).map -o $@ $(LDFLAGS) $(ARCH_LDFLAGS) -T$(ARCH_LDSCRIPT) $^
197+
$(CC) -Wl,-Map=$(HV_OBJDIR)/$(HV_FILE).map -o $@ $(LDFLAGS) $(ARCH_LDFLAGS) -T$(ARCH_LDSCRIPT) $^
198198

199199
.PHONY: clean
200200
clean:

0 commit comments

Comments
 (0)