Browse Source

Do not set MACOS_OLD on new macOS systems

tags/1.9.8
falkTX 7 years ago
parent
commit
bcfb07f773
2 changed files with 8 additions and 4 deletions
  1. +4
    -1
      data/macos/build.sh
  2. +4
    -3
      data/macos/env.sh

+ 4
- 1
data/macos/build.sh View File

@@ -20,7 +20,10 @@ source data/macos/common.env
MAKE_ARGS="${MAKE_ARGS} EXTERNAL_PLUGINS=false" MAKE_ARGS="${MAKE_ARGS} EXTERNAL_PLUGINS=false"


export MACOS="true" export MACOS="true"
export MACOS_OLD="true"

if [ $(clang -v 2>&1 | sed -n 's/.*version \([0-9]\).*/\1/p') -lt 9 ]; then
export MACOS_OLD="true"
fi


export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++


+ 4
- 3
data/macos/env.sh View File

@@ -5,13 +5,14 @@


source data/macos/common.env source data/macos/common.env


export MACOS="true"
export MACOS_OLD="true"
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++


export MACOS="true" export MACOS="true"
export MACOS_OLD="true"

if [ $(clang -v 2>&1 | sed -n 's/.*version \([0-9]\).*/\1/p') -lt 9 ]; then
export MACOS_OLD="true"
fi


export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++


Loading…
Cancel
Save