changeset 463:3903f30f1241

Allow -r to be used with -shared.
author Rob Landley <rob@landley.net>
date Thu, 30 Aug 2007 19:04:52 -0500
parents d861048cd5eb
children c95688b105f7
files tcc.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tcc.c	Tue Aug 28 20:56:28 2007 -0500
+++ b/tcc.c	Thu Aug 30 19:04:52 2007 -0500
@@ -9625,7 +9625,7 @@
             case TCC_OPTION_r:
                 /* generate a .o merging several output files */
                 reloc_output = 1;
-                output_type = TCC_OUTPUT_OBJ;
+                if (!output_type) output_type = TCC_OUTPUT_OBJ;
                 break;
             case TCC_OPTION_nostdinc:
                 s->nostdinc = 1;