diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-07-12 13:29:53 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-07-12 13:29:53 +0000 |
| commit | 2f2e6c7ce1ea89a6a4aaa2dfdf30b12986bf5115 (patch) | |
| tree | cebaa3ece77c09811cf16a84c97e11ece1946fc0 | |
| parent | 7f32f40c895410963e985c8e92bd8b1250414e62 (diff) | |
Pass ASFLAGS to assembler instead of CFLAGS
Originally committed as revision 19412 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 2 | ||||
| -rwxr-xr-x | configure | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/common.mak b/common.mak index 0d3b0d1258..02c730338c 100644 --- a/common.mak +++ b/common.mak @@ -24,7 +24,7 @@ CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $< %.o: %.S - $(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< + $(AS) $(CPPFLAGS) $(ASFLAGS) $(LIBOBJFLAGS) -c -o $@ $< %.ho: %.h $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< @@ -520,6 +520,10 @@ add_cflags(){ append CFLAGS "$@" } +add_asflags(){ + append ASFLAGS "$@" +} + add_ldflags(){ append LDFLAGS "$@" } @@ -551,7 +555,7 @@ check_as(){ log check_as "$@" cat > $TMPC log_file $TMPC - check_cmd $as $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC + check_cmd $as $CPPFLAGS $ASFLAGS "$@" -c -o $TMPO $TMPC } check_asm(){ @@ -1494,6 +1498,7 @@ test -n "$cc_type" && enable $cc_type || echolog "Unknown C compiler $cc" set_default as dep_cc ld add_cflags $extra_cflags +add_asflags $extra_cflags if test -n "$sysroot"; then case "$cc_type" in @@ -1920,6 +1925,7 @@ if test $cpu != "generic"; then fi add_cflags $cpuflags +add_asflags $cpuflags check_cc <<EOF || die "Symbol mangling check failed." int ff_extern; @@ -2498,6 +2504,7 @@ enabled stripping && echo "CPPFLAGS?=$CPPFLAGS" >> config.mak echo "CFLAGS=$CFLAGS" >> config.mak +echo "ASFLAGS=$ASFLAGS" >> config.mak echo "CC_O=$CC_O" >> config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak |