aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-28 21:29:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-28 21:29:13 +0100
commite283c26c35c4f18c8eb2e79183037a883b12d1e5 (patch)
tree58274ccb7e823f6c2924229ddd5f48eb9f2d9e64
parent71b95f2ab603ea607bc1b930fcfc3974b40ba484 (diff)
downloadffmpeg-e283c26c35c4f18c8eb2e79183037a883b12d1e5.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>
-rwxr-xr-xconfigure6
-rw-r--r--library.mak2
2 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 05932970c3..12d897dfac 100755
--- a/configure
+++ b/configure
@@ -731,7 +731,7 @@ add_ldflags(){
}
add_stripflags(){
- append STRIPFLAGS "$@"
+ append ASMSTRIPFLAGS "$@"
}
add_extralibs(){
@@ -902,7 +902,7 @@ test_stripflags(){
check_cc <<EOF
int main(void) { return 0; }
EOF
- check_cmd $strip $STRIPFLAGS "$@" $TMPO
+ check_cmd $strip $ASMSTRIPFLAGS "$@" $TMPO
}
check_stripflags(){
@@ -4880,7 +4880,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