diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2006-08-24 16:54:31 +0000 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2006-08-24 16:54:31 +0000 |
| commit | d1ee3e432d33c1abba4843b03b126cdb37bf464e (patch) | |
| tree | f8f9ea42b5ec3a895f7775906d548d9a1e63839c /build/jlibtool.c | |
| parent | 18a3c7249f9ccb2cdca924cdb0c30476cb7b425f (diff) | |
| download | apr-d1ee3e432d33c1abba4843b03b126cdb37bf464e.tar.gz | |
Follow-up to r433700 so as not to break linking executables. Doh.
* build/jlibtool.c
(add_dynamic_link_opts): Take parameter which indicates which arguments
should receive the dynamic link flags; when not in -silent, emit info.
(parse_args): Output newline when handling -MT flag.
(link_fixup, run_mode): Pass args to add_dynamic_link_opts.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@434433 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/jlibtool.c')
| -rw-r--r-- | build/jlibtool.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/build/jlibtool.c b/build/jlibtool.c index e884e20ef..132fdaaa9 100644 --- a/build/jlibtool.c +++ b/build/jlibtool.c @@ -934,14 +934,16 @@ char * load_noinstall_path(const char *arg, int pathlen) return expanded_path; } -void add_dynamic_link_opts(command_t *cmd_data) +void add_dynamic_link_opts(command_t *cmd_data, count_chars *args) { #ifdef DYNAMIC_LINK_OPTS if (cmd_data->options.pic_mode != pic_AVOID) { - push_count_chars(cmd_data->program_opts, - DYNAMIC_LINK_OPTS); + if (!cmd_data->options.silent) { + printf("Adding: %s\n", DYNAMIC_LINK_OPTS); + } + push_count_chars(args, DYNAMIC_LINK_OPTS); if (cmd_data->undefined_flag) { - push_count_chars(cmd_data->program_opts, "-undefined"); + push_count_chars(args, "-undefined"); #if defined(__APPLE__) /* -undefined dynamic_lookup is used by the bundled Python in * 10.4, but if we don't set MACOSX_DEPLOYMENT_TARGET to 10.3+, @@ -953,13 +955,14 @@ void add_dynamic_link_opts(command_t *cmd_data) "MACOSX_DEPLOYMENT_TARGET=10.3", 0); } #endif - push_count_chars(cmd_data->program_opts, - cmd_data->undefined_flag); + push_count_chars(args, cmd_data->undefined_flag); } else { #ifdef DYNAMIC_LINK_UNDEFINED - push_count_chars(cmd_data->program_opts, - DYNAMIC_LINK_UNDEFINED); + if (!cmd_data->options.silent) { + printf("Adding: %s\n", DYNAMIC_LINK_UNDEFINED); + } + push_count_chars(args, DYNAMIC_LINK_UNDEFINED); #endif } } @@ -1388,7 +1391,7 @@ void parse_args(int argc, char *argv[], command_t *cmd_data) argused = parse_output_file_name(arg, cmd_data); } else if (strcmp(arg+1, "MT") == 0) { if (!cmd_data->options.silent) { - printf("Adding: %s", arg); + printf("Adding: %s\n", arg); } push_count_chars(cmd_data->arglist, arg); arg = argv[++a]; @@ -1625,7 +1628,7 @@ void link_fixup(command_t *c) push_count_chars(c->arglist, c->output_name); append_count_chars(c->arglist, c->obj_files); append_count_chars(c->arglist, c->shared_opts.dependencies); - add_dynamic_link_opts(c); + add_dynamic_link_opts(c, c->arglist); } } } @@ -1842,7 +1845,7 @@ int run_mode(command_t *cmd_data) push_count_chars(cmd_data->program_opts, MODULE_OPTS); #endif } - add_dynamic_link_opts(cmd_data); + add_dynamic_link_opts(cmd_data, cmd_data->program_opts); rv = run_command(cmd_data, cmd_data->shared_opts.normal); if (rv) { |