aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2017-10-06 22:15:35 +0200
committerMarton Balint <cus@passwd.hu>2017-10-10 19:45:14 +0200
commitff6de6b180fd7c931410f81fb404ab3dbf30d40b (patch)
treec1d595e8967b20a6be9a0fb19e57d07e098b0d9c
parent17ba9e123f1e66fad92f0ff6bd7aaa7ddfac7ff4 (diff)
downloadffmpeg-ff6de6b180fd7c931410f81fb404ab3dbf30d40b.tar.gz
Makefile: generate stripped CLI tools directly instead of copying unstripped ones first
Now works with --disable-stripping. Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--Makefile4
-rwxr-xr-xconfigure4
2 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4a1253a052..642651d4cc 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,12 @@ include $(SRC_PATH)/doc/examples/Makefile
libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
+ifeq ($(STRIPTYPE),direct)
+ $(STRIP) -o $@ $<
+else
$(CP) $< $@
$(STRIP) $@
+endif
%$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
diff --git a/configure b/configure
index 1e2721b134..e9e1a4dff3 100755
--- a/configure
+++ b/configure
@@ -3363,6 +3363,7 @@ x86asmexe_default="nasm"
windres_default="windres"
nvcc_default="nvcc"
nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
+striptype="direct"
# OS
target_os_default=$(tolower $(uname -s))
@@ -5089,6 +5090,7 @@ case $target_os in
;;
os/2*)
strip="lxlite -CS"
+ striptype=""
objformat="aout"
add_cppflags -D_GNU_SOURCE
add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap
@@ -6834,6 +6836,7 @@ fi # test "$quiet" != "yes"
test -e Makefile || echo "include $source_path/Makefile" > Makefile
enabled stripping || strip="echo skipping strip"
+enabled stripping || striptype=""
config_files="$TMPH ffbuild/config.mak doc/config.texi"
@@ -6877,6 +6880,7 @@ ARFLAGS=$arflags
AR_O=$ar_o
RANLIB=$ranlib
STRIP=$strip
+STRIPTYPE=$striptype
NVCC=$nvcc
CP=cp -p
LN_S=$ln_s