Commit 74e8907e authored by Jerome Wu's avatar Jerome Wu

Test ignore closure in Mac

parent a28b9b9c
......@@ -29,10 +29,6 @@ jobs:
macos-build:
runs-on: macos-latest
steps:
- uses: joschi/setup-jdk@v2
with:
java-version: '6' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- uses: actions/checkout@v2
with:
submodules: recursive
......@@ -49,7 +45,6 @@ jobs:
- name: Build FFMpeg
shell: bash
run: |
java -version
export PATH=$PATH:$PWD/emsdk-cache/emsdk-master/upstream/bin
bash build.sh
- uses: actions/upload-artifact@master
......
......@@ -5,6 +5,14 @@ set -eo pipefail
ROOT=$1
BUILD_DIR=$2
OPT_FLAGS="-O3 --closure 1"
if [[ "$OSTYPE" == "darwin"* ]]; then
# As closure compiler requires java 6 and
# I don't find a way to install it in github actions
OPT_FLAGS="-O3"
fi
cd $ROOT
ARGS=(
--prefix=$BUILD_DIR # install library in a build directory for FFmpeg to include
......@@ -12,7 +20,7 @@ ARGS=(
--enable-static # enable building static library
--disable-cli # disable cli tools
--disable-asm # disable asm optimization
--extra-cflags="-s USE_PTHREADS=1 -O3 --closure 1" # flags to use pthread and code optimization
--extra-cflags="-s USE_PTHREADS=1 $OPT_FLAGS" # flags to use pthread and code optimization
)
emconfigure ./configure "${ARGS[@]}"
emmake make install-lib-static -j4
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment