Browse code

Pass ASFLAGS to assembler instead of CFLAGS

Originally committed as revision 19412 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2009/07/12 22:29:53
Showing 2 changed files
... ...
@@ -24,7 +24,7 @@ CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
24 24
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $<
25 25
 
26 26
 %.o: %.S
27
-	$(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
27
+	$(AS) $(CPPFLAGS) $(ASFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
28 28
 
29 29
 %.ho: %.h
30 30
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
... ...
@@ -520,6 +520,10 @@ add_cflags(){
520 520
     append CFLAGS "$@"
521 521
 }
522 522
 
523
+add_asflags(){
524
+    append ASFLAGS "$@"
525
+}
526
+
523 527
 add_ldflags(){
524 528
     append LDFLAGS "$@"
525 529
 }
... ...
@@ -551,7 +555,7 @@ check_as(){
551 551
     log check_as "$@"
552 552
     cat > $TMPC
553 553
     log_file $TMPC
554
-    check_cmd $as $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC
554
+    check_cmd $as $CPPFLAGS $ASFLAGS "$@" -c -o $TMPO $TMPC
555 555
 }
556 556
 
557 557
 check_asm(){
... ...
@@ -1494,6 +1498,7 @@ test -n "$cc_type" && enable $cc_type || echolog "Unknown C compiler $cc"
1494 1494
 set_default as dep_cc ld
1495 1495
 
1496 1496
 add_cflags $extra_cflags
1497
+add_asflags $extra_cflags
1497 1498
 
1498 1499
 if test -n "$sysroot"; then
1499 1500
     case "$cc_type" in
... ...
@@ -1920,6 +1925,7 @@ if test $cpu != "generic"; then
1920 1920
 fi
1921 1921
 
1922 1922
 add_cflags $cpuflags
1923
+add_asflags $cpuflags
1923 1924
 
1924 1925
 check_cc <<EOF || die "Symbol mangling check failed."
1925 1926
 int ff_extern;
... ...
@@ -2498,6 +2504,7 @@ enabled stripping &&
2498 2498
 
2499 2499
 echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
2500 2500
 echo "CFLAGS=$CFLAGS" >> config.mak
2501
+echo "ASFLAGS=$ASFLAGS" >> config.mak
2501 2502
 echo "CC_O=$CC_O" >> config.mak
2502 2503
 echo "LDFLAGS=$LDFLAGS" >> config.mak
2503 2504
 echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak