| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 08:45:13 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 08:45:37 (GMT) |
| commit | 3d5a995eac2a47ac116c3412b364c0d21717829b (patch) | |
| tree | 868ccd797d79473c7e382765a1ebc58ff367c969 | |
| parent | c1488fab3dd402d6d26b2b9124ab448715a8f01f (diff) | |
| parent | e52567c2954f627d420b30f75f71af2f2e4afe80 (diff) | |
| download | ffmpeg-3d5a995eac2a47ac116c3412b364c0d21717829b.zip ffmpeg-3d5a995eac2a47ac116c3412b364c0d21717829b.tar.gz ffmpeg-3d5a995eac2a47ac116c3412b364c0d21717829b.tar.bz2 | |
Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'
* commit 'e52567c2954f627d420b30f75f71af2f2e4afe80':
build: Strip spurious labels
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | library.mak | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -4758,9 +4758,9 @@ AR=$ar ARFLAGS=$arflags AR_O=$ar_o RANLIB=$ranlib +STRIP=$strip CP=cp -p LN_S=$ln_s -STRIP=$strip CPPFLAGS=$CPPFLAGS CFLAGS=$CFLAGS CXXFLAGS=$CXXFLAGS diff --git a/library.mak b/library.mak index 78c437e..6d9b989 100644 --- a/library.mak +++ b/library.mak @@ -25,6 +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 $@ $< + -@ $(if $(STRIP), $(STRIP) -wN '..@*' $@) LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS) $(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H |