aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-10-13 00:45:09 +0000
committerJames Almer <jamrial@gmail.com>2017-06-21 17:00:29 -0300
commit0cc0c5b6dbf187f9c096de03d999da040197ffe6 (patch)
tree554fd3ccd665715ceec7d2c9e1c1545368f55570 /configure
parentfd502f4f5fe8d2f241102ca9a529aa7f88209c22 (diff)
downloadffmpeg-0cc0c5b6dbf187f9c096de03d999da040197ffe6.tar.gz
build: Allow generating dependencies as a side-effect of assembling
(Cherry-picked from libav commit 3c0efbd03349ae68d3a25a082222652a102e3fd4) Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure b/configure
index 59d7a58131..2f32f99944 100755
--- a/configure
+++ b/configure
@@ -3329,6 +3329,7 @@ CXX_O='-o $@'
OBJCC_C='-c'
OBJCC_E='-E -o $@'
OBJCC_O='-o $@'
+X86ASM_O='-o $@'
LD_O='-o $@'
LD_LIB='-l%'
LD_PATH='-L'
@@ -5491,9 +5492,11 @@ EOF
if check_cmd $x86asmexe --version; then
enabled x86_64 && x86asm_extra="-m amd64"
x86asm_debug="-g dwarf2"
+ X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)'
elif check_cmd nasm -v; then
x86asmexe=nasm
x86asm_debug="-g -F dwarf"
+ X86ASM_DEPFLAGS='-MD $(@:.o=.d)'
if enabled x86_64; then
case "$objformat" in
elf) objformat=elf64 ;;
@@ -6739,6 +6742,7 @@ DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
X86ASM=$x86asmexe
DEPX86ASM=$x86asmexe
+DEPX86ASMFLAGS=\$(X86ASMFLAGS)
AR=$ar
ARFLAGS=$arflags
AR_O=$ar_o
@@ -6766,6 +6770,7 @@ CXX_O=$CXX_O
NVCC_C=$NVCC_C
NVCC_O=$NVCC_O
LD_O=$LD_O
+X86ASM_O=$X86ASM_O
LD_LIB=$LD_LIB
LD_PATH=$LD_PATH
DLLTOOL=$dlltool
@@ -6793,8 +6798,11 @@ CXXDEP=$CXXDEP
CCDEP_FLAGS=$CCDEP_FLAGS
ASDEP=$ASDEP
ASDEP_FLAGS=$ASDEP_FLAGS
+X86ASMDEP=$X86ASMDEP
+X86ASMDEP_FLAGS=$X86ASMDEP_FLAGS
CC_DEPFLAGS=$CC_DEPFLAGS
AS_DEPFLAGS=$AS_DEPFLAGS
+X86ASM_DEPFLAGS=$X86ASM_DEPFLAGS
HOSTCC=$host_cc
HOSTLD=$host_ld
HOSTCFLAGS=$host_cflags