diff options
| author | lloyd <[email protected]> | 2006-09-04 23:05:12 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2006-09-04 23:05:12 +0000 |
| commit | 7e12db8aaab2cd67cb320af053beb3d361730887 (patch) | |
| tree | d3db834b3f1f4cb65144f573769c1ade1470418f /configure.pl | |
| parent | ffd193e64152ec800f40d1eec973b5ae52f07d6a (diff) | |
Remove CC_AR_COMMAND
Prevent some undefined variable warnings in Makefile generation
Diffstat (limited to 'configure.pl')
| -rwxr-xr-x | configure.pl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.pl b/configure.pl index b95624d71..045afb1ec 100755 --- a/configure.pl +++ b/configure.pl @@ -77,7 +77,7 @@ my(%SUBMODEL_ALIAS, %ARCH, %ARCH_ALIAS, %CC_DEBUG_FLAGS, %CC_NO_DEBUG_FLAGS, %CC_MACHINE_OPT_FLAGS, %CC_MACHINE_OPT_FLAGS_RE, %CC_ABI_FLAGS, %CC_SUPPORTS_OS, - %CC_SUPPORTS_ARCH, %CC_AR_COMMAND, %MAKEFILE_STYLE); + %CC_SUPPORTS_ARCH, %MAKEFILE_STYLE); my $user_set_root = ''; my ($doc_dir, $lib_dir); @@ -1027,7 +1027,9 @@ sub generate_makefile { # See if there are any over-riding methods. We presume if CC is creating # the static libs, it knows how to create the index itself. - if($CC_AR_COMMAND{$cc}) { $ar_command = $CC_AR_COMMAND{$cc}; } + if($COMPILER{$cc}{'ar_command'}) { + $ar_command = $COMPILER{$cc}{'ar_command'}; + } elsif(os_ar_command($os)) { $ar_command = os_ar_command($os); @@ -1193,6 +1195,9 @@ sub print_unix_makefile { my $doc_list = file_list(16, undef, undef, undef, %$docs); + $lang_flags = '' if not defined($lang_flags); + $warn_flags = '' if not defined($warn_flags); + ##################### / COMMON CODE (PARTIALLY) ###################### print_header($makefile, 'Compiler Options'); @@ -1422,6 +1427,9 @@ sub print_nmake_makefile { ##################### / COMMON CODE (PARTIALLY) ###################### + $warn_flags = '' unless defined($warn_flags); + $lang_flags = '' unless defined($lang_flags); + print_header($makefile, 'Compiler Options'); print $makefile <<END_OF_MAKEFILE_HEADER; CXX = $cc @@ -1916,7 +1924,6 @@ sub set_cc_defines { $CC_LIB_OPT_FLAGS{$cc} = $info{'lib_opt_flags'}; $CC_CHECK_OPT_FLAGS{$cc} = $info{'check_opt_flags'}; - $CC_AR_COMMAND{$cc} = $info{'ar_command'}; $CC_LANG_FLAGS{$cc} = $info{'lang_flags'}; $CC_WARN_FLAGS{$cc} = $info{'warning_flags'}; $CC_SO_OBJ_FLAGS{$cc} = $info{'so_obj_flags'}; |