mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-13 04:44:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug in my previous change to fix a bug in fjh's previous change.

Browse Source 
Estimated hours taken: 0.5
Branches: main

Fix a bug in my previous change to fix a bug in fjh's previous change.
Revert back to using '/out:', and instead add the flag '/link' so that '/out:'
is passed to the linker instead to avoid problems compiling the library.

scripts/Mmake.rules:
compiler/compile_target_code.m:
	Add '/link' before the '/out:'.

scripts/Mmake.rules:
	Also add fjh's change for /LD to other rules building .dlls.
This commit is contained in:
Peter Ross
2002-11-15 12:09:18 +00:00
parent e79cb48f1d
commit dc060b2ed3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/compile_target_code.m
View File

@@ -230,7 +230,7 @@ compile_managed_cplusplus_file(ErrorStream,
{ string__append_list([MCPP, " -CLR ", DebugOpt, InclOpts, { string__append_list([MCPP, " -CLR ", DebugOpt, InclOpts,
DLLDirOpts, MCPPFlags, " ", MCPPFileName, DLLDirOpts, MCPPFlags, " ", MCPPFileName,
" /LD -out:", DLLFileName], " /LD /link -out:", DLLFileName],
Command) }, Command) },
invoke_system_command(ErrorStream, verbose_commands, invoke_system_command(ErrorStream, verbose_commands,
Command, Succeeded). Command, Succeeded).

4
scripts/Mmake.rules
View File

@@ -271,7 +271,7 @@ $(os_subdir)%.dll : %.cpp
$(MS_CL) -CLR$(MS_CL_NOASM) $(ALL_MS_CLFLAGS) \ $(MS_CL) -CLR$(MS_CL_NOASM) $(ALL_MS_CLFLAGS) \
-I`$(FIX_PATH_FOR_CL) $(MERC_C_INCL_DIR)` \ -I`$(FIX_PATH_FOR_CL) $(MERC_C_INCL_DIR)` \
-AI`$(FIX_PATH_FOR_CL) $(MERC_DLL_DIR)` $< \ -AI`$(FIX_PATH_FOR_CL) $(MERC_DLL_DIR)` $< \
/LD $(MS_CL_LIBS) -o $@ /LD /link $(MS_CL_LIBS) -out:$@
rm -f $*.obj rm -f $*.obj
$(os_subdir)%.dll : %.cs $(os_subdir)%.dll : %.cs
@@ -380,7 +380,7 @@ ifeq ($(findstring il,$(GRADE)),il)
$(MS_CL) -CLR$(MS_CL_NOASM) $(ALL_MS_CLFLAGS) \ $(MS_CL) -CLR$(MS_CL_NOASM) $(ALL_MS_CLFLAGS) \
-I`$(FIX_PATH_FOR_CL) $(MERC_C_INCL_DIR)` \ -I`$(FIX_PATH_FOR_CL) $(MERC_C_INCL_DIR)` \
-AI`$(FIX_PATH_FOR_CL) $(MERC_DLL_DIR)` $< \ -AI`$(FIX_PATH_FOR_CL) $(MERC_DLL_DIR)` $< \
-link -noentry mscoree.lib -dll $(MS_CL_LIBS) -out:$@ -LD -link $(MS_CL_LIBS) -out:$@
rm -f $*.obj rm -f $*.obj
.cs.dll: .cs.dll: