Fix build flag enumeration of scripts.d with subdirs
This commit is contained in:
		
							parent
							
								
									d98ab0239e
								
							
						
					
					
						commit
						6aa734be0a
					
				
					 1 changed files with 2 additions and 1 deletions
				
			
		
							
								
								
									
										3
									
								
								build.sh
									
										
									
									
									
								
							
							
						
						
									
										3
									
								
								build.sh
									
										
									
									
									
								
							| 
						 | 
					@ -1,5 +1,6 @@
 | 
				
			||||||
#!/bin/bash
 | 
					#!/bin/bash
 | 
				
			||||||
set -xe
 | 
					set -xe
 | 
				
			||||||
 | 
					shopt -s globstar
 | 
				
			||||||
cd "$(dirname "$0")"
 | 
					cd "$(dirname "$0")"
 | 
				
			||||||
source util/vars.sh
 | 
					source util/vars.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,7 +24,7 @@ done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export FFBUILD_PREFIX="$(docker run --rm "$IMAGE" bash -c 'echo $FFBUILD_PREFIX')"
 | 
					export FFBUILD_PREFIX="$(docker run --rm "$IMAGE" bash -c 'echo $FFBUILD_PREFIX')"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
for script in scripts.d/*.sh; do
 | 
					for script in scripts.d/**/*.sh; do
 | 
				
			||||||
    FF_CONFIGURE+=" $(get_output $script configure)"
 | 
					    FF_CONFIGURE+=" $(get_output $script configure)"
 | 
				
			||||||
    FF_CFLAGS+=" $(get_output $script cflags)"
 | 
					    FF_CFLAGS+=" $(get_output $script cflags)"
 | 
				
			||||||
    FF_CXXFLAGS+=" $(get_output $script cxxflags)"
 | 
					    FF_CXXFLAGS+=" $(get_output $script cxxflags)"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue