diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-28 21:29:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 01:03:48 +0100 |
| commit | bfdfeadf1154423f6c4556ea759c7a4c618b5bc4 (patch) | |
| tree | 90165ee3cfc457b870d4d11ee1da293e7d0a4c39 | |
| parent | 7ae6229b97f38405cb8d84cb44e31e2dc24da7eb (diff) | |
| download | ffmpeg-bfdfeadf1154423f6c4556ea759c7a4c618b5bc4.tar.gz | |
build sys: rename STRIPFLAGS to ASMSTRIPFLAGS
This more closely matches the actual use, also we use plain
strip without these flags for striping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e283c26c35c4f18c8eb2e79183037a883b12d1e5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | library.mak | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -730,7 +730,7 @@ add_ldflags(){ } add_stripflags(){ - append STRIPFLAGS "$@" + append ASMSTRIPFLAGS "$@" } add_extralibs(){ @@ -896,7 +896,7 @@ test_stripflags(){ check_cc <<EOF int main(void) { return 0; } EOF - check_cmd $strip $STRIPFLAGS "$@" $TMPO + check_cmd $strip $ASMSTRIPFLAGS "$@" $TMPO } check_stripflags(){ @@ -4832,7 +4832,7 @@ LD_PATH=$LD_PATH DLLTOOL=$dlltool LDFLAGS=$LDFLAGS SHFLAGS=$(echo $($ldflags_filter $SHFLAGS)) -STRIPFLAGS=$STRIPFLAGS +ASMSTRIPFLAGS=$ASMSTRIPFLAGS YASMFLAGS=$YASMFLAGS BUILDSUF=$build_suffix PROGSSUF=$progs_suffix diff --git a/library.mak b/library.mak index e9128b809d..36c883d034 100644 --- a/library.mak +++ b/library.mak @@ -25,7 +25,7 @@ $(SUBDIR)%-test.i: $(SUBDIR)%.c $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $< - -$(STRIP) $(STRIPFLAGS) $@ + -$(STRIP) $(ASMSTRIPFLAGS) $@ LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS) $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H |