Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

add --ar and --arflags options to Configure.pl

git-svn-id: https://svn.parrot.org/parrot/trunk@49433 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
commit d716b343b9dcda99e6f73cacb4e75a7b9ba1dbe4 1 parent aeb0cab
@plobsing plobsing authored
View
8 Configure.pl
@@ -285,6 +285,14 @@ =head2 Compile Options
Use the given linker flags
+=item C<--ar=(archiver)>
+
+Specify which librarian to use for static libraries
+
+=item C<--arflags=(flags)>
+
+Use the given librarian flags for static libraris
+
=item C<--ld=(linker)>
Specify which loader to use for shared libraries.
View
2  config/gen/makefiles/root.in
@@ -79,7 +79,7 @@ MKPATH = @mkpath@
RM_F = @rm_f@
RM_RF = @rm_rf@
TOUCH = @touch@
-AR_CR = @ar@ @ar_flags@
+AR_CR = @ar@ @arflags@
RANLIB = @ranlib@
YACC = @yacc@
LEX = @lex@
View
2  config/init/defaults.pm
@@ -197,7 +197,7 @@ sub runstep {
touch => '$(PERL) -MExtUtils::Command -e touch',
ar => $Config{ar},
- ar_flags => 'cr',
+ arflags => 'cr',
# for Win32
ar_out => '',
View
6 config/init/hints/mswin32.pm
@@ -99,7 +99,7 @@ sub runstep {
libparrot_static => 'libparrot' . $conf->data->get('a'),
libparrot_shared => "libparrot$share_ext",
ar => 'lib',
- ar_flags => '',
+ arflags => '',
ar_out => '-out:',
slash => '\\',
ccflags => $ccflags,
@@ -150,7 +150,7 @@ sub runstep {
ld_out => '-out:',
ldflags => '-nologo -nodefaultlib',
ar => 'xilib',
- ar_flags => '',
+ arflags => '',
ar_out => '-out:',
slash => '\\',
ccflags => $ccflags,
@@ -195,7 +195,7 @@ sub runstep {
linkflags => '',
ar => 'tlib /a /P128',
- ar_flags => '',
+ arflags => '',
ar_out => '',
ar_extra => '',
slash => '\\',
View
12 config/inter/progs.pm
@@ -75,7 +75,7 @@ sub _get_programs {
my ($conf, $ask) = @_;
# Set each variable individually so that hints files can use them as
# triggers to help pick the correct defaults for later answers.
- my ( $cc, $link, $ld, $ccflags, $linkflags, $ldflags, $libs, $lex, $yacc );
+ my ( $cc, $link, $ld, $ccflags, $linkflags, $ar, $arflags, $ldflags, $libs, $lex, $yacc );
$cc = integrate( $conf->data->get('cc'), $conf->options->get('cc') );
$cc = prompt( "What C compiler do you want to use?", $cc )
if $ask;
@@ -102,6 +102,16 @@ sub _get_programs {
$conf->debug("\nccflags: $ccflags\n");
+ $ar = integrate( $conf->data->get('ar'), $conf->options->get('ar') );
+ $ar = promt( "What archiver do you want to use to build static libraries?", $ar ) if $ask;
+ $conf->data->set( ar => $ar );
+
+ $arflags = integrate( $conf->data->get('arflags'), $conf->options->get('arflags') );
+ $arflags = prompt( "What flags should your archiver receive to create static libraries?",
+ $arflags) if $ask;
+ $conf->data->set( arflags => $arflags );
+
+
$linkflags = $conf->data->get('linkflags');
# Remove the path to the Perl library (from Win32 config).
# See TT #854.
View
2  lib/Parrot/Configure/Options/Conf.pm
@@ -72,6 +72,8 @@ Compile Options:
--libs=(libs) Use the given libraries
--link=(linker) Use the given linker
--linkflags=(flags) Use the given linker flags
+ --ar=(archiver) Use the given librarian for static libraries
+ --arflags=(flags) Use the given flags for static libraries
--ld=(linker) Use the given loader for shared libraries
--ldflags=(flags) Use the given loader flags for shared libraries
--lex=(lexer) Use the given lexical analyzer generator
View
2  lib/Parrot/Configure/Options/Conf/Shared.pm
@@ -10,6 +10,8 @@ our @EXPORT_OK = qw(
);
our @shared_valid_options = qw{
+ ar
+ arflags
bindir
cage
cc
Please sign in to comment.
Something went wrong with that request. Please try again.