Rely on environment to provide global flags
This commit is contained in:
		
							parent
							
								
									9737292aca
								
							
						
					
					
						commit
						6f3c668b22
					
				
					 5 changed files with 13 additions and 13 deletions
				
			
		| 
						 | 
					@ -11,7 +11,7 @@ RUN \
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ADD toolchain.cmake /toolchain.cmake
 | 
					ADD toolchain.cmake /toolchain.cmake
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw64" \
 | 
					ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw32" \
 | 
				
			||||||
    FFBUILD_TOOLCHAIN=x86_64-w64-mingw32 \
 | 
					    FFBUILD_TOOLCHAIN=x86_64-w64-mingw32 \
 | 
				
			||||||
    FFBUILD_CROSS_PREFIX=x86_64-w64-mingw32- \
 | 
					    FFBUILD_CROSS_PREFIX=x86_64-w64-mingw32- \
 | 
				
			||||||
    FFBUILD_PREFIX=/opt/ffbuild \
 | 
					    FFBUILD_PREFIX=/opt/ffbuild \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
FF_CONFIGURE="--enable-gpl --enable-version3"
 | 
					FF_CONFIGURE="--enable-gpl --enable-version3"
 | 
				
			||||||
FF_CFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CFLAGS=""
 | 
				
			||||||
FF_CXXFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CXXFLAGS=""
 | 
				
			||||||
FF_LDFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_LDFLAGS=""
 | 
				
			||||||
GIT_BRANCH="release/4.2"
 | 
					GIT_BRANCH="release/4.2"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
FF_CONFIGURE="--enable-gpl --enable-version3"
 | 
					FF_CONFIGURE="--enable-gpl --enable-version3"
 | 
				
			||||||
FF_CFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CFLAGS=""
 | 
				
			||||||
FF_CXXFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CXXFLAGS=""
 | 
				
			||||||
FF_LDFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_LDFLAGS=""
 | 
				
			||||||
GIT_BRANCH="master"
 | 
					GIT_BRANCH="master"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
FF_CONFIGURE="--enable-version3"
 | 
					FF_CONFIGURE="--enable-version3"
 | 
				
			||||||
FF_CFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CFLAGS=""
 | 
				
			||||||
FF_CXXFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CXXFLAGS=""
 | 
				
			||||||
FF_LDFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_LDFLAGS=""
 | 
				
			||||||
GIT_BRANCH="release/4.2"
 | 
					GIT_BRANCH="release/4.2"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
FF_CONFIGURE="--enable-version3"
 | 
					FF_CONFIGURE="--enable-version3"
 | 
				
			||||||
FF_CFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CFLAGS=""
 | 
				
			||||||
FF_CXXFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_CXXFLAGS=""
 | 
				
			||||||
FF_LDFLAGS="-static-libgcc -static-libstdc++"
 | 
					FF_LDFLAGS=""
 | 
				
			||||||
GIT_BRANCH="master"
 | 
					GIT_BRANCH="master"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue