mirror of
https://github.com/opelly27/Stockfish.git
synced 2026-05-20 08:37:44 +00:00
Remove COMPILER from Makefile
The same functionality is available by using COMPCXX and having another variable which does the same is just confusing. There was only one mention on Stockfish Wiki about this which has been changed to COMPCXX. closes https://github.com/official-stockfish/Stockfish/pull/5154 No functional change
This commit is contained in:
committed by
Joost VandeVondele
parent
94484db6e8
commit
de2244284b
@@ -10,7 +10,7 @@ jobs:
|
|||||||
name: ${{ matrix.config.name }} ${{ matrix.binaries }}
|
name: ${{ matrix.config.name }} ${{ matrix.binaries }}
|
||||||
runs-on: ${{ matrix.config.os }}
|
runs-on: ${{ matrix.config.os }}
|
||||||
env:
|
env:
|
||||||
COMPILER: ${{ matrix.config.compiler }}
|
COMPCXX: ${{ matrix.config.compiler }}
|
||||||
COMP: ${{ matrix.config.comp }}
|
COMP: ${{ matrix.config.comp }}
|
||||||
EMU: ${{ matrix.config.emu }}
|
EMU: ${{ matrix.config.emu }}
|
||||||
EXT: ${{ matrix.config.ext }}
|
EXT: ${{ matrix.config.ext }}
|
||||||
@@ -62,7 +62,7 @@ jobs:
|
|||||||
if [ $COMP == ndk ]; then
|
if [ $COMP == ndk ]; then
|
||||||
export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
|
export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
|
||||||
fi
|
fi
|
||||||
$COMPILER -v
|
$COMPCXX -v
|
||||||
|
|
||||||
- name: Test help target
|
- name: Test help target
|
||||||
run: make help
|
run: make help
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ jobs:
|
|||||||
name: ${{ matrix.config.name }} ${{ matrix.binaries }}
|
name: ${{ matrix.config.name }} ${{ matrix.binaries }}
|
||||||
runs-on: ${{ matrix.config.os }}
|
runs-on: ${{ matrix.config.os }}
|
||||||
env:
|
env:
|
||||||
COMPILER: ${{ matrix.config.compiler }}
|
COMPCXX: ${{ matrix.config.compiler }}
|
||||||
COMP: ${{ matrix.config.comp }}
|
COMP: ${{ matrix.config.comp }}
|
||||||
EXT: ${{ matrix.config.ext }}
|
EXT: ${{ matrix.config.ext }}
|
||||||
NAME: ${{ matrix.config.simple_name }}
|
NAME: ${{ matrix.config.simple_name }}
|
||||||
@@ -50,7 +50,7 @@ jobs:
|
|||||||
run: make net
|
run: make net
|
||||||
|
|
||||||
- name: Check compiler
|
- name: Check compiler
|
||||||
run: $COMPILER -v
|
run: $COMPCXX -v
|
||||||
|
|
||||||
- name: Test help target
|
- name: Test help target
|
||||||
run: make help
|
run: make help
|
||||||
@@ -59,7 +59,7 @@ jobs:
|
|||||||
run: git --version
|
run: git --version
|
||||||
|
|
||||||
- name: Check compiler
|
- name: Check compiler
|
||||||
run: $COMPILER -v
|
run: $COMPCXX -v
|
||||||
|
|
||||||
- name: Show g++ cpu info
|
- name: Show g++ cpu info
|
||||||
if: runner.os != 'macOS'
|
if: runner.os != 'macOS'
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ jobs:
|
|||||||
name: ${{ matrix.sanitizers.name }}
|
name: ${{ matrix.sanitizers.name }}
|
||||||
runs-on: ${{ matrix.config.os }}
|
runs-on: ${{ matrix.config.os }}
|
||||||
env:
|
env:
|
||||||
COMPILER: ${{ matrix.config.compiler }}
|
COMPCXX: ${{ matrix.config.compiler }}
|
||||||
COMP: ${{ matrix.config.comp }}
|
COMP: ${{ matrix.config.comp }}
|
||||||
CXXFLAGS: "-Werror"
|
CXXFLAGS: "-Werror"
|
||||||
strategy:
|
strategy:
|
||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
run: make net
|
run: make net
|
||||||
|
|
||||||
- name: Check compiler
|
- name: Check compiler
|
||||||
run: $COMPILER -v
|
run: $COMPCXX -v
|
||||||
|
|
||||||
- name: Test help target
|
- name: Test help target
|
||||||
run: make help
|
run: make help
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ jobs:
|
|||||||
name: ${{ matrix.config.name }}
|
name: ${{ matrix.config.name }}
|
||||||
runs-on: ${{ matrix.config.os }}
|
runs-on: ${{ matrix.config.os }}
|
||||||
env:
|
env:
|
||||||
COMPILER: ${{ matrix.config.compiler }}
|
COMPCXX: ${{ matrix.config.compiler }}
|
||||||
COMP: ${{ matrix.config.comp }}
|
COMP: ${{ matrix.config.comp }}
|
||||||
CXXFLAGS: "-Werror"
|
CXXFLAGS: "-Werror"
|
||||||
strategy:
|
strategy:
|
||||||
@@ -172,9 +172,9 @@ jobs:
|
|||||||
if [ $COMP == ndk ]; then
|
if [ $COMP == ndk ]; then
|
||||||
export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
|
export PATH=${{ env.ANDROID_NDK_BIN }}:$PATH
|
||||||
fi
|
fi
|
||||||
$COMPILER -v
|
$COMPCXX -v
|
||||||
else
|
else
|
||||||
echo "$COMPILER -v" > script.sh
|
echo "$COMPCXX -v" > script.sh
|
||||||
docker run --rm --platform ${{ matrix.config.platform }} -v ${{ github.workspace }}/src:/app sf_builder
|
docker run --rm --platform ${{ matrix.config.platform }} -v ${{ github.workspace }}/src:/app sf_builder
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ jobs:
|
|||||||
name: ${{ matrix.config.name }} ${{ matrix.binaries }}
|
name: ${{ matrix.config.name }} ${{ matrix.binaries }}
|
||||||
runs-on: ${{ matrix.config.os }}
|
runs-on: ${{ matrix.config.os }}
|
||||||
env:
|
env:
|
||||||
COMPILER: ${{ matrix.config.compiler }}
|
COMPCXX: ${{ matrix.config.compiler }}
|
||||||
COMP: ${{ matrix.config.comp }}
|
COMP: ${{ matrix.config.comp }}
|
||||||
EXT: ${{ matrix.config.ext }}
|
EXT: ${{ matrix.config.ext }}
|
||||||
NAME: ${{ matrix.config.simple_name }}
|
NAME: ${{ matrix.config.simple_name }}
|
||||||
|
|||||||
@@ -546,11 +546,6 @@ else
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
### Travis CI script uses COMPILER to overwrite CXX
|
|
||||||
ifdef COMPILER
|
|
||||||
COMPCXX=$(COMPILER)
|
|
||||||
endif
|
|
||||||
|
|
||||||
### Allow overwriting CXX from command line
|
### Allow overwriting CXX from command line
|
||||||
ifdef COMPCXX
|
ifdef COMPCXX
|
||||||
CXX=$(COMPCXX)
|
CXX=$(COMPCXX)
|
||||||
|
|||||||
Reference in New Issue
Block a user