diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 228fb2df7..db767cc2c 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -49,7 +49,7 @@ jobs: - name: Configure and Build shell: bash run: | - bash scripts/${{ runner.os }}/1_build.sh --${{ matrix.precision }} --nightly --use_brew_llvm --ccache + bash scripts/${{ runner.os }}/1_build.sh --${{ matrix.precision }} --nightly --ccache - name: Deploy shell: bash run: | diff --git a/scripts/macOS/1_build.sh b/scripts/macOS/1_build.sh index 35b39d3a6..a616e9b1f 100644 --- a/scripts/macOS/1_build.sh +++ b/scripts/macOS/1_build.sh @@ -20,7 +20,6 @@ INSTALL_PATH=$SOURCE_PATH/../install CORES="-j4" DOUBLE_PRECISION_OPTION="" NIGHTLY_OPTION="" -USE_BREW_LLVM=false QT_DIR="" CCACHE="" @@ -52,10 +51,6 @@ case $i in QT_DIR=${i#*=} shift # past argument=value ;; - --use_brew_llvm) - USE_BREW_LLVM=true - shift # past argument=value - ;; --ccache) CCACHE="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" shift # past argument=value @@ -78,16 +73,6 @@ then mkdir -p $INSTALL_PATH fi -if [ "$USE_BREW_LLVM" = true ] ; then - export PATH="$(brew --prefix llvm)/bin:$PATH"; - export CC=/usr/local/opt/llvm/bin/clang - export CXX=/usr/local/opt/llvm/bin/clang++ - export COMPILER=${CXX} - export CFLAGS="-I /usr/local/include -I/usr/local/opt/llvm/include" - export CXXFLAGS="-I /usr/local/include -I/usr/local/opt/llvm/include" - export LDFLAGS="-L /usr/local/lib -L/usr/local/opt/llvm/lib" -fi - cd $BUILD_PATH cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $CCACHE $DOUBLE_PRECISION_OPTION $NIGHTLY_OPTION $SOURCE_PATH make $CORES