This allows non-standard replacements for the -c compiler flag. Some compilers use other flags or no flag at all in place of the usual one.
Signed-off-by: Mans Rullgard <[email protected]> --- Makefile | 2 +- configure | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3716e9e..4579b89 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) define COMPILE $(call $(1)DEP,$(1)) - $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) -c $($(1)_O) $< + $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $< endef COMPILE_C = $(call COMPILE,CC) diff --git a/configure b/configure index 2a91109..4038870 100755 --- a/configure +++ b/configure @@ -629,7 +629,7 @@ check_cc(){ log check_cc "$@" cat > $TMPC log_file $TMPC - check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c $(cc_o $TMPO) $TMPC + check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC } check_cpp(){ @@ -643,7 +643,7 @@ check_as(){ log check_as "$@" cat > $TMPC log_file $TMPC - check_cmd $as $CPPFLAGS $ASFLAGS "$@" -c -o $TMPO $TMPC + check_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C -o $TMPO $TMPC } check_asm(){ @@ -1727,10 +1727,13 @@ asflags_filter=echo cflags_filter=echo ldflags_filter=echo +AS_C='-c' AS_O='-o $@' +CC_C='-c' CC_E='-E -o $@' CC_O='-o $@' LD_O='-o $@' +HOSTCC_C='-c' HOSTCC_O='-o $@' host_cflags='-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600 -O3 -g' @@ -2047,7 +2050,7 @@ probe_cc(){ pfx=$1 _cc=$2 - unset _type _ident _cc_e _cc_o _flags _cflags _ldflags + unset _type _ident _cc_c _cc_e _cc_o _flags _cflags _ldflags unset _depflags _DEPCMD _DEPFLAGS _flags_filter=echo @@ -2163,6 +2166,7 @@ probe_cc(){ } set_ccvars(){ + eval ${1}_C=\${_cc_c-\${${1}_C}} eval ${1}_E=\${_cc_e-\${${1}_E}} eval ${1}_O=\${_cc_o-\${${1}_O}} @@ -3412,7 +3416,9 @@ LN_S=$ln_s CPPFLAGS=$CPPFLAGS CFLAGS=$CFLAGS ASFLAGS=$ASFLAGS +AS_C=$AS_C AS_O=$AS_O +CC_C=$CC_C CC_O=$CC_O LD_O=$LD_O DLLTOOL=$dlltool @@ -3445,6 +3451,7 @@ DEPHOSTCCFLAGS=$DEPHOSTCCFLAGS \$(HOSTCCFLAGS) HOSTCCDEP=$HOSTCCDEP HOSTCCDEP_FLAGS=$HOSTCCDEP_FLAGS HOSTCC_DEPFLAGS=$HOSTCC_DEPFLAGS +HOSTCC_C=$HOSTCC_C HOSTCC_O=$HOSTCC_O TARGET_EXEC=$target_exec TARGET_PATH=$target_path -- 1.7.11.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
