[m-rev.] diff: remove .foreign_os mmake variable

Tyson Dowd trd at cs.mu.OZ.AU
Wed Jul 18 20:16:09 AEST 2001


You should amend the log message so that you say *WHY* you are making
this change. 

I'm guessing it's because by fixing the rule for making .cpp into .dll
you can avoid needing .foreign_os, so it is simpler to just remove them.

On 18-Jul-2001, Peter Ross <peter.ross at miscrit.be> wrote:
> Hi,
> 
> 
> ===================================================================
> 
> 
> Estimated hours taken: 0.25
> Branches: main
> 
> Remove the .foreign_os variable.
> 
> compiler/modules.m:
>     Don't generate any references to .foreign_os.
> 
> scripts/Mmake.rules:
>     Remove the .obj file which is created as a side effect by MSVC.
> 
> 
> Index: compiler/modules.m
> ===================================================================
> RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
> retrieving revision 1.174
> diff -u -r1.174 modules.m
> --- compiler/modules.m	18 Jul 2001 09:25:58 -0000	1.174
> +++ compiler/modules.m	18 Jul 2001 09:35:04 -0000
> @@ -2953,14 +2953,6 @@
>  					ForeignExt, ForeignBasis, DepStream),
>  	io__write_string(DepStream, "\n"),
>  
> -		% .foreign_os are the object files which are generated
> -		% by the MC++ compiler.
> -	io__write_string(DepStream, MakeVarName),
> -	io__write_string(DepStream, ".foreign_os = "),
> -	write_compact_dependencies_list(ForeignModules, "$(os_subdir)", ".obj",
> -					ForeignBasis, DepStream),
> -	io__write_string(DepStream, "\n"),
> -
>  		% The dlls which contain the foreign_code.
>  	io__write_string(DepStream, MakeVarName),
>  	io__write_string(DepStream, ".foreign_dlls = "),
> @@ -3616,7 +3608,6 @@
>  		"\t-rm -f $(", MakeVarName, ".profs)\n",
>  		"\t-rm -f $(", MakeVarName, ".errs)\n",
>  		"\t-rm -f $(", MakeVarName, ".foreign_cs)\n",
> -		"\t-rm -f $(", MakeVarName, ".foreign_os)\n",
>  		"\t-rm -f $(", MakeVarName, ".schemas)\n"
>  	]),
>  
> Index: scripts/Mmake.rules
> ===================================================================
> RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
> retrieving revision 1.101
> diff -u -r1.101 Mmake.rules
> --- scripts/Mmake.rules	17 Jul 2001 15:40:38 -0000	1.101
> +++ scripts/Mmake.rules	18 Jul 2001 09:35:05 -0000
> @@ -250,6 +250,7 @@
>  	$(MS_CL) -CLR$(MS_CL_NOASM) -I`cygpath -w $(MERC_C_INCL_DIR)` \
>  		-AI`cygpath -w $(MERC_DLL_DIR)` $(ALL_MS_CLFLAGS) $< \
>  		-link -noentry mscoree.lib -dll $(MS_CL_LIBS) -out:$@
> +	rm -f $*.obj
>  
>  $(os_subdir)%.dll : %.il
>  	$(MS_ILASM) $(ALL_MS_ILASMFLAGS) /dll /quiet /OUT=$@ $<
> @@ -352,6 +353,7 @@
>  .cpp.dll:
>  	$(MS_CL) -CLR($MS_CL_NOASM) -I$(MERCURY_LIBRARY_PATH) $< \
>  		-link -noentry mscoree.lib -dll $(MS_CL_LIBS) -out:$@
> +	rm -f $*.obj
>  
>  .cpp.exe:
>  	$(MS_CL) -CLR($MS_CL_NOASM) -I$(MERCURY_LIBRARY_PATH) $< -link -entry:main $(MS_CL_LIBS) -out:$@
> 
> --------------------------------------------------------------------------
> 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
> --------------------------------------------------------------------------

-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't everyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list