highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile .S files with $(AS), set it in configure

Browse Source 
Assembler files using the GNU syntax need to be processed by gcc,
whichever compiler is used for C files.

Originally committed as revision 17827 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2009-03-05 21:20:01 +00:00
parent a3398feb26
commit 313c46a610
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.mak
View File

@@ -24,7 +24,7 @@ CFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(OPTFLAGS)
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
%.o: %.S %.o: %.S
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< $(AS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
%.ho: %.h %.ho: %.h
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<

7
configure vendored
View File

@@ -178,6 +178,7 @@ show_help(){
echo " --target-exec=CMD command to run executables on target" echo " --target-exec=CMD command to run executables on target"
echo " --target-path=DIR path to view of build directory on target" echo " --target-path=DIR path to view of build directory on target"
echo " --nm=NM use nm tool" echo " --nm=NM use nm tool"
echo " --as=AS use assembler AS [$as_default]"
echo " --cc=CC use C compiler CC [$cc_default]" echo " --cc=CC use C compiler CC [$cc_default]"
echo " --host-cc=HOSTCC use host C compiler HOSTCC" echo " --host-cc=HOSTCC use host C compiler HOSTCC"
echo " --host-cflags=HCFLAGS use HCFLAGS when compiling for host" echo " --host-cflags=HCFLAGS use HCFLAGS when compiling for host"
@@ -938,6 +939,7 @@ PATHS_LIST='
CMDLINE_SET=" CMDLINE_SET="
$PATHS_LIST $PATHS_LIST
arch arch
as
build_suffix build_suffix
cc cc
cpu cpu
@@ -1140,6 +1142,7 @@ shlibdir_default="$libdir_default"
# toolchain # toolchain
ar="ar" ar="ar"
as_default="gcc"
cc_default="gcc" cc_default="gcc"
host_cc_default="gcc" host_cc_default="gcc"
ln_s="ln -sf" ln_s="ln -sf"
@@ -1306,6 +1309,7 @@ set >> $logfile
test -n "$cross_prefix" && enable cross_compile test -n "$cross_prefix" && enable cross_compile
ar="${cross_prefix}${ar}" ar="${cross_prefix}${ar}"
as_default="${cross_prefix}${as_default}"
cc_default="${cross_prefix}${cc_default}" cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}" nm_default="${cross_prefix}${nm_default}"
ranlib="${cross_prefix}${ranlib}" ranlib="${cross_prefix}${ranlib}"
@@ -1313,7 +1317,7 @@ strip="${cross_prefix}${strip}"
sysinclude_default="${sysroot}/usr/include" sysinclude_default="${sysroot}/usr/include"
set_default cc nm sysinclude set_default as cc nm sysinclude
enabled cross_compile || host_cc_default=$cc enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc
@@ -2329,6 +2333,7 @@ echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak
echo "DATADIR=\$(DESTDIR)$datadir" >> config.mak echo "DATADIR=\$(DESTDIR)$datadir" >> config.mak
echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak
echo "CC=$cc" >> config.mak echo "CC=$cc" >> config.mak
echo "AS=$as" >> config.mak
echo "YASM=$yasmexe" >> config.mak echo "YASM=$yasmexe" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak echo "RANLIB=$ranlib" >> config.mak