[m-rev.] diff: fix interactive query options

[Simon Taylor]

Estimated hours taken: 0.1
Branches: main

browser/interactive_query.m:
	Always take the grade from the executable, not the options
	supplied by the user. This prevents the setting of `--pic-reg'
	being overridden if the tests/debugger/Mmakefile puts `--grade'
	in the `mmc_options' command in tests/debugger/interactive.inp.

Index: interactive_query.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/interactive_query.m,v
retrieving revision 1.15
diff -u -u -r1.15 interactive_query.m
--- interactive_query.m	12 Jun 2002 14:26:40 -0000	1.15
+++ interactive_query.m	1 Jul 2002 09:10:55 -0000
@@ -407,6 +407,9 @@
 compile_file(Options, Succeeded) -->
 	%
 	% We use the following options:
+	%	--grade
+	%		make sure the grade of libmdb_query.so matches the
+	%		grade of the executable it will be linked against
 	%	--pic-reg
 	%		needed for shared libraries / dynamic linking
 	%	--infer-all
@@ -426,13 +429,13 @@
 	%		symbols defined in the program
 	%
 	{ string__append_list([
-		"mmc --grade ", grade_option, " ",
-		"--infer-all --no-verbose-make ",
-		"--pic-reg ", "-O0 --no-c-optimize ",
+		"mmc --infer-all --no-verbose-make -O0 --no-c-optimize ",
 		"--no-warn-simple-code --no-warn-det-decls-too-lax ",
 		"--output-compile-error-lines 10000 ",
 		"--link-flags --allow-undefined ", Options,
-		" --compile-to-shared-lib ", query_module_name],
+		" --grade ", grade_option,
+		" --pic-reg --compile-to-shared-lib ",
+		query_module_name],
 		Command) },
 	invoke_system_command(Command, Succeeded).
 
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------