Skip to content

Commit

Permalink
Commit version 2.1; fix target order in compiler command line
Browse files Browse the repository at this point in the history
  • Loading branch information
RogerGee committed Jul 22, 2014
1 parent 0722ed9 commit d1f0f91
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/* globals */
const char* PROGRAM_NAME;
const unsigned short PROGRAM_MAJOR_VERSION = 2;
const unsigned short PROGRAM_MINOR_VERSION = 0; /* every increment counts as a hundreth */
const unsigned short PROGRAM_MINOR_VERSION = 10; /* every increment counts as a hundreth */

static void option_help();
static void option_version();
Expand Down
8 changes: 4 additions & 4 deletions compiler.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ int compile_session(session* psession)
init_stringbuf(&arguments);
assign_stringbuf(&arguments,psession->compiler_info->program.buffer);
append_terminator_stringbuf(&arguments);
for (i = 0;i < psession->targets_c;++i) {
concat_stringbuf(&arguments,psession->targets[i].buffer);
append_terminator_stringbuf(&arguments);
}
i = 0;
while ( psession->compiler_info->options.buffer[i] ) {
process_option(psession,&arguments,psession->compiler_info->options.buffer+i);
Expand All @@ -109,10 +113,6 @@ int compile_session(session* psession)
}
for (i = 0;i < psession->options_c;++i)
process_option(psession,&arguments,(psession->options+i)->buffer);
for (i = 0;i < psession->targets_c;++i) {
concat_stringbuf(&arguments,psession->targets[i].buffer);
append_terminator_stringbuf(&arguments);
}
i = invoke_compiler(psession->compiler_info->program.buffer,arguments.buffer);
if (i == -1) {
fprintf(stderr,"%s: error: could not properly start compiler process\n",PROGRAM_NAME);
Expand Down

0 comments on commit d1f0f91

Please sign in to comment.