build: I misunderstood these makefile conditionals.
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Build Tilde Friends / Build-All (push) Failing after 2m56s
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Build Tilde Friends / Build-All (push) Failing after 2m56s
				
			This commit is contained in:
		
							
								
								
									
										18
									
								
								GNUmakefile
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								GNUmakefile
									
									
									
									
									
								
							| @@ -33,9 +33,9 @@ UNAME_M := $(shell uname -m) | ||||
| ANDROID_SDK ?= ~/Android/Sdk | ||||
| BUNDLETOOL = out/bundletool.jar | ||||
|  | ||||
| HAVE_WIN := 0 | ||||
| HAVE_CROSS_AARCH64 := 0 | ||||
| USE_SYSTEM_SSL := 0 | ||||
| HAVE_WIN := | ||||
| HAVE_CROSS_AARCH64 := | ||||
| USE_SYSTEM_SSL := | ||||
|  | ||||
| export SOURCE_DATE_EPOCH=1 | ||||
| export TZ=UTC | ||||
| @@ -44,11 +44,11 @@ ifeq ($(UNAME_S),Darwin) | ||||
| BUILD_TYPES := macosdebug macosrelease iosdebug iosrelease iossimdebug iossimrelease | ||||
| else ifeq ($(UNAME_S),Linux) | ||||
| BUILD_TYPES := debug release | ||||
| HAVE_ANDROID = $(if $(shell which $(ANDROID_SDK)/platform-tools/adb),1,0) | ||||
| HAVE_LINUX_IOS = $(if $(shell which deps/ios_toolchain/target/bin deps/ios_toolchain/target/bin/arm-apple-darwin11-clang),1,0) | ||||
| HAVE_WIN = $(if $(shell which x86_64-w64-mingw32-gcc-win32),1,0) | ||||
| HAVE_ANDROID = $(if $(shell which $(ANDROID_SDK)/platform-tools/adb),1) | ||||
| HAVE_LINUX_IOS = $(if $(shell which deps/ios_toolchain/target/bin deps/ios_toolchain/target/bin/arm-apple-darwin11-clang),1) | ||||
| HAVE_WIN = $(if $(shell which x86_64-w64-mingw32-gcc-win32),1) | ||||
| ifneq ($(UNAME_M),aarch64) | ||||
| HAVE_CROSS_AARCH64 = $(if $(shell which aarch64-linux-gnu-gcc),1,0) | ||||
| HAVE_CROSS_AARCH64 = $(if $(shell which aarch64-linux-gnu-gcc),1) | ||||
| endif | ||||
| else ifeq ($(UNAME_S),Haiku) | ||||
| BUILD_TYPES := debug release | ||||
| @@ -64,8 +64,8 @@ CFLAGS += \ | ||||
| LDFLAGS += \ | ||||
| 	-lexecinfo \ | ||||
| 	-lc++abi | ||||
| HAVE_ANDROID := 0 | ||||
| HAVE_LINUX_IOS := 0 | ||||
| HAVE_ANDROID := | ||||
| HAVE_LINUX_IOS := | ||||
| else | ||||
| $(error Unexpected host platform $(UNAME_S).) | ||||
| endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user