[m-rev.] For review: Fix bug when using FIX_PATH_FOR_CSC

[Eric Taucher]

Fix bug when using FIX_PATH_FOR_CSC.

 

scripts/Mmake.rules:

            FIX_PATH_FOR_CSC is a shell command and needs to be executed to
expand correctly. Wrapped in $(shell ) to fix.

 

 

Index: Mmake.rules

===================================================================

RCS file: /home/mercury/mercury1/repository/mercury/scripts/Mmake.rules,v

retrieving revision 1.154

diff -u -r1.154 Mmake.rules

--- Mmake.rules 14 Jul 2007 02:33:23 -0000         1.154

+++ Mmake.rules          30 Jul 2007 22:10:11 -0000

@@ -278,7 +278,7 @@

 ifeq ($(findstring il,$(GRADE)),il)

 

 $(os_subdir)%.dll : %.cs

-           $(MS_CSC) /t:library /lib:`$(FIX_PATH_FOR_CSC) $(MERC_DLL_DIR)`
\

+          $(MS_CSC) /t:library /lib:$(shell $(FIX_PATH_FOR_CSC)
"$(MERC_DLL_DIR)") \

                        /out:$@ $(CSHARP_ASSEMBLY_REFS-$*)
$(ALL_MS_CSCFLAGS) $<

 

 $(os_subdir)%.dll : %.il

@@ -384,11 +384,11 @@

            $(MS_ILASM) $(ALL_MS_ILASMFLAGS) /quiet /OUT=$@ $<

 

 .cs.dll:

-           $(MS_CSC) /t:library /lib:`$(FIX_PATH_FOR_CSC) $(MERC_DLL_DIR)`
\

+          $(MS_CSC) /t:library /lib:$(shell $(FIX_PATH_FOR_CSC)
"$(MERC_DLL_DIR)") \

                        /out:$@ $(CSHARP_ASSEMBLY_REFS-$*) $(EXTRA_CSCFLAGS)
$<

 

 .cs.exe:

-           $(MS_CSC) /lib:`$(FIX_PATH_FOR_CSC) $(MERC_DLL_DIR)` /out:$@ \

+          $(MS_CSC) /lib:$(shell $(FIX_PATH_FOR_CSC) "$(MERC_DLL_DIR)")
/out:$@ \

                        $(CSHARP_ASSEMBLY_REFS-$*) $(EXTRA_CSCFLAGS) $<

 

 endif # $(findstring il,$(GRADE)) != ""

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20070730/558e928f/attachment.html>