File tree 1 file changed +10
-5
lines changed
1 file changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -336,11 +336,16 @@ impl Build {
336
336
ar. get_args ( ) . collect :: < Vec < _ > > ( ) . join ( OsStr :: new ( " " ) ) ,
337
337
) ;
338
338
}
339
- let ranlib = cc. get_ranlib ( ) ;
340
- // OpenSSL does not support RANLIBFLAGS. Jam the flags in RANLIB.
341
- let mut args = vec ! [ ranlib. get_program( ) ] ;
342
- args. extend ( ranlib. get_args ( ) ) ;
343
- configure. env ( "RANLIB" , args. join ( OsStr :: new ( " " ) ) ) ;
339
+
340
+ // We don't have GCC in newer NDK versions.
341
+ if !target. contains ( "android" ) || ( target. contains ( "android" ) && path. contains ( "-gcc" ) )
342
+ {
343
+ let ranlib = cc. get_ranlib ( ) ;
344
+ // OpenSSL does not support RANLIBFLAGS. Jam the flags in RANLIB.
345
+ let mut args = vec ! [ ranlib. get_program( ) ] ;
346
+ args. extend ( ranlib. get_args ( ) ) ;
347
+ configure. env ( "RANLIB" , args. join ( OsStr :: new ( " " ) ) ) ;
348
+ }
344
349
345
350
// Make sure we pass extra flags like `-ffunction-sections` and
346
351
// other things like ARM codegen flags.
You can’t perform that action at this time.
0 commit comments