Skip to content
Snippets Groups Projects
Commit 3c0efbd0 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

build: Allow generating dependencies as a side-effect of assembling

parent 39e208f4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 3
− 3
View file @ 3c0efbd0
...@@ -30,7 +30,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS) ...@@ -30,7 +30,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS)
OBJCFLAGS += $(EOBJCFLAGS) OBJCFLAGS += $(EOBJCFLAGS)
OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS) OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm X86ASMFLAGS += $(IFLAGS:%=%/) -I$(<D)/ -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS) HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS) LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
...@@ -42,6 +42,7 @@ endef ...@@ -42,6 +42,7 @@ endef
COMPILE_C = $(call COMPILE,CC) COMPILE_C = $(call COMPILE,CC)
COMPILE_S = $(call COMPILE,AS) COMPILE_S = $(call COMPILE,AS)
COMPILE_M = $(call COMPILE,OBJCC) COMPILE_M = $(call COMPILE,OBJCC)
COMPILE_X86ASM = $(call COMPILE,X86ASM)
COMPILE_HOSTC = $(call COMPILE,HOSTCC) COMPILE_HOSTC = $(call COMPILE,HOSTCC)
%.o: %.c %.o: %.c
...@@ -57,8 +58,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) ...@@ -57,8 +58,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(COMPILE_HOSTC) $(COMPILE_HOSTC)
%.o: %.asm %.o: %.asm
$(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) $(COMPILE_X86ASM)
$(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -o $@ $<
-$(STRIP) $(STRIPFLAGS) $@ -$(STRIP) $(STRIPFLAGS) $@
%.i: %.c %.i: %.c
......
configure
+ 8
− 0
View file @ 3c0efbd0
...@@ -2628,6 +2628,7 @@ CC_O='-o $@' ...@@ -2628,6 +2628,7 @@ CC_O='-o $@'
OBJCC_C='-c' OBJCC_C='-c'
OBJCC_E='-E -o $@' OBJCC_E='-E -o $@'
OBJCC_O='-o $@' OBJCC_O='-o $@'
X86ASM_O='-o $@'
LD_O='-o $@' LD_O='-o $@'
LD_LIB='-l%' LD_LIB='-l%'
LD_PATH='-L' LD_PATH='-L'
...@@ -4476,9 +4477,11 @@ EOF ...@@ -4476,9 +4477,11 @@ EOF
if check_cmd $x86asmexe --version; then if check_cmd $x86asmexe --version; then
enabled x86_64 && x86asm_extra="-m amd64" enabled x86_64 && x86asm_extra="-m amd64"
x86asm_debug="-g dwarf2" x86asm_debug="-g dwarf2"
X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)'
elif check_cmd nasm -v; then elif check_cmd nasm -v; then
x86asmexe=nasm x86asmexe=nasm
x86asm_debug="-g -F dwarf" x86asm_debug="-g -F dwarf"
X86ASM_DEPFLAGS='-MD $(@:.o=.d)'
enabled x86_64 && test "$objformat" = elf && objformat=elf64 enabled x86_64 && test "$objformat" = elf && objformat=elf64
fi fi
...@@ -5335,6 +5338,7 @@ DEPAS=$as ...@@ -5335,6 +5338,7 @@ DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
X86ASM=$x86asmexe X86ASM=$x86asmexe
DEPX86ASM=$x86asmexe DEPX86ASM=$x86asmexe
DEPX86ASMFLAGS=\$(X86ASMFLAGS)
AR=$ar AR=$ar
ARFLAGS=$arflags ARFLAGS=$arflags
AR_O=$ar_o AR_O=$ar_o
...@@ -5353,6 +5357,7 @@ OBJCC_O=$OBJCC_O ...@@ -5353,6 +5357,7 @@ OBJCC_O=$OBJCC_O
CC_C=$CC_C CC_C=$CC_C
CC_E=$CC_E CC_E=$CC_E
CC_O=$CC_O CC_O=$CC_O
X86ASM_O=$X86ASM_O
LD_O=$LD_O LD_O=$LD_O
LD_LIB=$LD_LIB LD_LIB=$LD_LIB
LD_PATH=$LD_PATH LD_PATH=$LD_PATH
...@@ -5373,8 +5378,11 @@ CCDEP=$CCDEP ...@@ -5373,8 +5378,11 @@ CCDEP=$CCDEP
CCDEP_FLAGS=$CCDEP_FLAGS CCDEP_FLAGS=$CCDEP_FLAGS
ASDEP=$ASDEP ASDEP=$ASDEP
ASDEP_FLAGS=$ASDEP_FLAGS ASDEP_FLAGS=$ASDEP_FLAGS
X86ASMDEP=$X86ASMDEP
X86ASMDEP_FLAGS=$X86ASMDEP_FLAGS
CC_DEPFLAGS=$CC_DEPFLAGS CC_DEPFLAGS=$CC_DEPFLAGS
AS_DEPFLAGS=$AS_DEPFLAGS AS_DEPFLAGS=$AS_DEPFLAGS
X86ASM_DEPFLAGS=$X86ASM_DEPFLAGS
HOSTCC=$host_cc HOSTCC=$host_cc
HOSTLD=$host_ld HOSTLD=$host_ld
HOSTCFLAGS=$host_cflags HOSTCFLAGS=$host_cflags
......
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