mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	Merge pull request #5276 from B3n30/fix_travis_frozen_linux
fix travis-ci frozen mingw build
This commit is contained in:
		
						commit
						64694b0f11
					
				
					 4 changed files with 13 additions and 1 deletions
				
			
		|  | @ -43,6 +43,7 @@ matrix: | |||
|       dist: trusty | ||||
|       services: docker | ||||
|       cache: ccache | ||||
|       install: "./.travis/linux-frozen/deps.sh" | ||||
|       script: "./.travis/linux-frozen/build.sh" | ||||
|     - os: linux | ||||
|       env: NAME="MinGW build" | ||||
|  |  | |||
|  | @ -1,4 +1,3 @@ | |||
| #!/bin/bash -ex | ||||
| mkdir -p "$HOME/.ccache" | ||||
| docker pull citraemu/build-environments:linux-frozen | ||||
| docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-frozen /bin/bash -ex /citra/.travis/linux-frozen/docker.sh | ||||
|  |  | |||
							
								
								
									
										5
									
								
								.travis/linux-frozen/deps.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										5
									
								
								.travis/linux-frozen/deps.sh
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +1,5 @@ | |||
| #!/bin/sh -ex | ||||
| 
 | ||||
| sudo apt-get -y install binutils-gold | ||||
| 
 | ||||
| docker pull citraemu/build-environments:linux-frozen | ||||
|  | @ -1,5 +1,12 @@ | |||
| #!/bin/bash -ex | ||||
| 
 | ||||
| mkdir -p ~/bin/gold | ||||
| echo '#!/bin/bash' > ~/bin/gold/ld | ||||
| echo 'gold "$@"' >> ~/bin/gold/ld | ||||
| chmod a+x ~/bin/gold/ld | ||||
| export CFLAGS="-B$HOME/bin/gold $CFLAGS" | ||||
| export CXXFLAGS="-B$HOME/bin/gold $CXXFLAGS" | ||||
| 
 | ||||
| cd /citra | ||||
| 
 | ||||
| mkdir build && cd build | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue