ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Mar 29 21:03:33 2018 -0300| [44df2e858889ab8e41d6a9f403433d7adc304bbe] | committer: James Almer
Merge commit '5292e97c42b05db7ad4e51c1ea756b12fdf721ff' * commit '5292e97c42b05db7ad4e51c1ea756b12fdf721ff': configure: Document available options for the --toolchain parameter Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44df2e858889ab8e41d6a9f403433d7adc304bbe --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index fc65f1024f..d233d1ed9e 100755 --- a/configure +++ b/configure @@ -342,6 +342,10 @@ Toolchain options: --target-samples=DIR path to samples directory on target --tempprefix=PATH force fixed dir/prefix instead of mktemp for checks --toolchain=NAME set tool defaults according to NAME + (gcc-asan, clang-asan, gcc-msan, clang-msan, + gcc-tsan, clang-tsan, gcc-usan, clang-usan, + valgrind-massif, valgrind-memcheck, + msvc, icl, gcov, llvm-cov, hardened) --nm=NM use nm tool NM [$nm_default] --ar=AR use archive tool AR [$ar_default] --as=AS use assembler AS [$as_default] ====================================================================== diff --cc configure index fc65f1024f,d8c3b555cc..d233d1ed9e --- a/configure +++ b/configure @@@ -340,25 -259,21 +340,29 @@@ Toolchain options --target-exec=CMD command to run executables on target --target-path=DIR path to view of build directory on target --target-samples=DIR path to samples directory on target + --tempprefix=PATH force fixed dir/prefix instead of mktemp for checks --toolchain=NAME set tool defaults according to NAME + (gcc-asan, clang-asan, gcc-msan, clang-msan, + gcc-tsan, clang-tsan, gcc-usan, clang-usan, + valgrind-massif, valgrind-memcheck, + msvc, icl, gcov, llvm-cov, hardened) - --nm=NM use nm tool + --nm=NM use nm tool NM [$nm_default] --ar=AR use archive tool AR [$ar_default] --as=AS use assembler AS [$as_default] + --ln_s=LN_S use symbolic link tool LN_S [$ln_s_default] + --strip=STRIP use strip tool STRIP [$strip_default] + --windres=WINDRES use windows resource compiler WINDRES [$windres_default] + --x86asmexe=EXE use nasm-compatible assembler EXE [$x86asmexe_default] --cc=CC use C compiler CC [$cc_default] + --cxx=CXX use C compiler CXX [$cxx_default] --objcc=OCC use ObjC compiler OCC [$cc_default] --dep-cc=DEPCC use dependency generator DEPCC [$cc_default] - --ld=LD use linker LD - --x86asmexe=X86ASM use x86 assembler X86ASM + --nvcc=NVCC use Nvidia CUDA compiler NVCC [$nvcc_default] + --ld=LD use linker LD [$ld_default] --pkg-config=PKGCONFIG use pkg-config tool PKGCONFIG [$pkg_config_default] --pkg-config-flags=FLAGS pass additional flags to pkgconf [] + --ranlib=RANLIB use ranlib RANLIB [$ranlib_default] + --doxygen=DOXYGEN use DOXYGEN to generate API doc [$doxygen_default] --host-cc=HOSTCC use host C compiler HOSTCC --host-cflags=HCFLAGS use HCFLAGS when compiling for host --host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
