Skip to content

Commit

Permalink
contrib: Improve Libav configuration and compiler flags on 32-bit Intel.
Browse files Browse the repository at this point in the history
Removes old Darwin-specific i386 stuffs and replaces with generic stuffs.

Fixes an issue cross-compiling compiling current master for i686.
  • Loading branch information
bradleysepos committed Jul 20, 2017
1 parent b77f66d commit c643347
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions contrib/ffmpeg/module.defs
Expand Up @@ -112,20 +112,12 @@ endif
## enable compile verbosity
FFMPEG.BUILD.extra = V=1

##
## llvm inline assembler (used in llvm-gcc and clang) runs out of registers
## on darwin i386 - unclear if it is a source code or llvm bug.
##
ifeq (darwin-i386,$(BUILD.system)-$(BUILD.machine))
## optimize mode hack: use clang
ifneq (none,$(FFMPEG.GCC.O))
FFMPEG.GCC.gcc = clang
endif

## debug mode hack: omit frame pointer
ifneq (none,$(FFMPEG.GCC.g))
FFMPEG.GCC.args.extra += -fomit-frame-pointer
endif
# 32-bit intel
ifneq (,$(filter $(BUILD.machine),i386 i486 i586 i686))
# avoid running out of registers
FFMPEG.GCC.args.extra += -fomit-frame-pointer
# avoid 'asm' operand has impossible constraints errors
FFMPEG.CONFIGURE.extra += --disable-inline-asm
endif

## For POSIX.1-2001
Expand Down

0 comments on commit c643347

Please sign in to comment.