mirror of
				https://github.com/openresty/openresty.git
				synced 2024-10-13 00:29:41 +00:00 
			
		
		
		
	now we default to LuaJIT instead of the standard Lua 5.1 interpreter.
This commit is contained in:
		
							
								
								
									
										852
									
								
								t/sanity.t
									
									
									
									
									
								
							
							
						
						
									
										852
									
								
								t/sanity.t
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										14
									
								
								util/configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								util/configure
									
									
									
									
										vendored
									
									
								
							| @ -150,7 +150,10 @@ for my $opt (@ARGV) { | ||||
|         $prefix = $1; | ||||
|  | ||||
|     } elsif ($opt eq '--without-lua51') { | ||||
|         $resty_opts{no_lua} = 1; | ||||
|         undef $resty_opts{lua}; | ||||
|  | ||||
|     } elsif ($opt eq '--with-lua51') { | ||||
|         $resty_opts{lua} = 1; | ||||
|  | ||||
|     } elsif ($opt =~ /^--with-lua51=(.*)/) { | ||||
|         $resty_opts{lua_path} = $1; | ||||
| @ -394,11 +397,12 @@ _END_ | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     if (! $opts->{luajit} && ! $opts->{luajit_path} | ||||
|         && ! $opts->{no_http_lua} && ! $opts->{no_lua} | ||||
|         && ! $opts->{lua_path}) | ||||
|     if (!$opts->{lua} | ||||
|         && !$opts->{lua_path} | ||||
|         && !$opts->{no_http_lua} | ||||
|         && !$opts->{luajit_path}) | ||||
|     { | ||||
|         $opts->{lua} = 1; | ||||
|         $opts->{luajit} = 1; | ||||
|     } | ||||
|  | ||||
|     if ($opts->{luajit} && $opts->{luajit_path}) { | ||||
|  | ||||
| @ -33,10 +33,11 @@ my $cfg_opts = "--with-http_iconv_module"; | ||||
|  | ||||
| if ($opts{l}) { | ||||
|     $lua = 'Lua'; | ||||
|     $cfg_opts .= " --with-lua51"; | ||||
|  | ||||
| } else { | ||||
|     $lua = 'LuaJIT'; | ||||
|     $cfg_opts .= " --with-luajit"; | ||||
|     #$cfg_opts .= " --with-luajit"; | ||||
| } | ||||
|  | ||||
| if ($^O eq 'solaris') { | ||||
|  | ||||
		Reference in New Issue
	
	Block a user