diff options
| -rwxr-xr-x | configure.pl | 12 | ||||
| -rw-r--r-- | misc/config/makefile/unix.in | 3 | ||||
| -rw-r--r-- | misc/config/makefile/unix_shr.in | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/configure.pl b/configure.pl index 92871a53c..d68cb2e56 100755 --- a/configure.pl +++ b/configure.pl @@ -478,15 +478,13 @@ sub os_install_info { sub mach_opt { my ($config) = @_; - my $cc = $$config{'compiler'}; - my $submodel = $$config{'submodel'}; - my $arch = $$config{'arch'}; - - my %ccinfo = %{$COMPILER{$cc}}; + my %ccinfo = %{$COMPILER{$$config{'compiler'}}}; # Nothing we can do in that case return '' unless defined($ccinfo{'mach_opt_flags'}); + my $submodel = $$config{'submodel'}; + my $arch = $$config{'arch'}; if(defined($ccinfo{'mach_opt_flags'}{$submodel})) { return $ccinfo{'mach_opt_flags'}{$submodel}; @@ -1509,7 +1507,7 @@ sub generate_makefile { 'so_link' => $so_link_flags, 'ar_command' => $ar_command, - 'ar_needs_ranlib' => $ar_needs_ranlib, + 'ranlib_command' => ($ar_needs_ranlib ? 'ranlib' : 'true'), 'static_suffix' => os_info_for($os, 'static_suffix'), 'so_suffix' => os_info_for($os, 'so_suffix'), 'obj_suffix' => os_info_for($os, 'obj_suffix'), @@ -1613,8 +1611,6 @@ sub build_cmds { sub print_unix_makefile { my ($config) = @_; - die "fixme: ar_needs_ranlib is ignored" if $$config{'ar_needs_ranlib'}; - my $src = $$config{'sources'}; my $check = $$config{'check_src'}; diff --git a/misc/config/makefile/unix.in b/misc/config/makefile/unix.in index 773fda58d..9f83c0970 100644 --- a/misc/config/makefile/unix.in +++ b/misc/config/makefile/unix.in @@ -46,7 +46,7 @@ INSTALL_CMD_DATA = @{var:install_cmd_data} LN = ln -fs MKDIR = @mkdir MKDIR_INSTALL = @umask 022; mkdir -p -m $(EXEC_MODE) -RANLIB = @ranlib +RANLIB = @{var:ranlib_command} RM = @rm -f RM_R = @rm -rf @@ -89,6 +89,7 @@ $(CHECK): $(LIBRARIES) $(CHECKOBJS) $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) $(AR) $(STATIC_LIB) $(LIBOBJS) + $(RANLIB) $(STATIC_LIB) ################################################## # Fake Targets # diff --git a/misc/config/makefile/unix_shr.in b/misc/config/makefile/unix_shr.in index 9e8d54eec..30cf70538 100644 --- a/misc/config/makefile/unix_shr.in +++ b/misc/config/makefile/unix_shr.in @@ -48,7 +48,7 @@ INSTALL_CMD_DATA = @{var:install_cmd_data} LN = ln -fs MKDIR = @mkdir MKDIR_INSTALL = @umask 022; mkdir -p -m $(EXEC_MODE) -RANLIB = @ranlib +RANLIB = @{var:ranlib_command} RM = @rm -f RM_R = @rm -rf @@ -96,6 +96,7 @@ $(CHECK): $(LIBRARIES) $(CHECKOBJS) $(STATIC_LIB): $(LIBOBJS) $(RM) $(STATIC_LIB) $(AR) $(STATIC_LIB) $(LIBOBJS) + $(RANLIB) $(STATIC_LIB) $(SHARED_LIB): $(LIBOBJS) $(SO_LINK_CMD) $(LINK_TO) $(LIBOBJS) -o $(SHARED_LIB) |