[buildcore] Remove duplicate defines and add extra detection for Python 3
This commit is contained in:
		
							
								
								
									
										14
									
								
								deps/buildcore/base.mk
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								deps/buildcore/base.mk
									
									
									
									
										vendored
									
									
								
							| @@ -16,13 +16,15 @@ else | ||||
| 	HOST_ENV=${OS}-$(shell uname -m) | ||||
| endif | ||||
|  | ||||
| ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3) | ||||
| 	PYTHON3=python | ||||
| else | ||||
| 	PYTHON3=python3 | ||||
| endif | ||||
|  | ||||
| SCRIPTS=${BUILDCORE_PATH}/scripts | ||||
| SETUP_BUILD=python3 ${SCRIPTS}/setup-build.py | ||||
| PYBB=python3 ${SCRIPTS}/pybb.py | ||||
| CMAKE_BUILD=${PYBB} cmake-build | ||||
| RM_RF=${PYBB} rm | ||||
| SETUP_BUILD=python3 ${SCRIPTS}/setup-build.py | ||||
| PYBB=python3 ${SCRIPTS}/pybb.py | ||||
| SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py | ||||
| PYBB=${PYTHON3} ${SCRIPTS}/pybb.py | ||||
| CMAKE_BUILD=${PYBB} cmake-build | ||||
| RM_RF=${PYBB} rm | ||||
| ifdef USE_VCPKG | ||||
|   | ||||
		Reference in New Issue
	
	Block a user