Commit bce7b696 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

Add PIC flags early so tests they affect give correct results

This is mainly the checks for ebx on x86, but possibly others too.

Originally committed as revision 19687 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c7312933
......@@ -22,14 +22,14 @@ CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS)
%.o: %.c
$(CCDEP)
$(CC) $(CPPFLAGS) $(CFLAGS) $(CC_DEPFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $<
$(CC) $(CPPFLAGS) $(CFLAGS) $(CC_DEPFLAGS) -c $(CC_O) $<
%.o: %.S
$(ASDEP)
$(AS) $(CPPFLAGS) $(ASFLAGS) $(AS_DEPFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
$(AS) $(CPPFLAGS) $(ASFLAGS) $(AS_DEPFLAGS) -c -o $@ $<
%.ho: %.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
$(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
%$(EXESUF): %.c
......
......@@ -2051,6 +2051,12 @@ check_deps $ARCH_EXT_LIST
disabled optimizations || check_cflags -fomit-frame-pointer
if enabled pic; then
add_cppflags -DPIC
add_cflags -fPIC
add_asflags -fPIC
fi
check_cc <<EOF || die "Symbol mangling check failed."
int ff_extern;
EOF
......@@ -2443,8 +2449,6 @@ elif enabled gcc; then
check_cflags -fno-tree-vectorize
fi
enabled pic && LIBOBJFLAGS='$(PIC)'
if enabled gprof; then
add_cflags -p
add_ldflags -p
......@@ -2634,8 +2638,6 @@ echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "YASMFLAGS=$YASMFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
echo "PIC=-fPIC -DPIC" >> config.mak
echo "BUILDSUF=$build_suffix" >> config.mak
echo "FULLNAME=$FULLNAME" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment