Commit 4bfb28c6 authored by John van Groningen's avatar John van Groningen

add LibNameObjPath to the linkopts for linking a dynamically linked executable

parent 813718af
......@@ -20,6 +20,7 @@ from UtilStrictLists import :: List
, gen_dll :: !Bool
, dll_names :: !String
, dynamics_path :: !String
, lib_name_obj_path :: !String
}
emptyLinkInfo` :: LinkInfo`
......
......@@ -21,6 +21,7 @@ import UtilOptions, UtilStrictLists
, gen_dll :: !Bool
, dll_names :: !String
, dynamics_path :: !String
, lib_name_obj_path :: !String
}
emptyLinkInfo` :: LinkInfo`
......@@ -39,8 +40,8 @@ emptyLinkInfo` =
, gen_dll = False
, dll_names = ""
, dynamics_path = ""
, lib_name_obj_path = ""
}
//-- Link Args Options File
......@@ -101,6 +102,7 @@ LinkOptionsTable =
, SimpleOption "GenDLL" (\a->if a.gen_dll "1" "0") (\v a->{a & gen_dll=(if (v=="1") True False)})
, SimpleOption "DLLSymbols" (\a->a.dll_names) (\v a->{a & dll_names=v})
, SimpleOption "DynamicLinker" (\a->a.dynamics_path) (\v a->{a & dynamics_path=v})
, SimpleOption "LibNameObjPath" (\a->a.lib_name_obj_path) (\v a->{a & lib_name_obj_path=v})
}
PathOption =SimpleOption "Path" id const
......
......@@ -479,7 +479,6 @@ ReadErrorsAndWarnings path env
(_,env) = fclose file` env
= ((errors,errors_and_warnings_read,errlist),env)
ReadErrorAndWarningMessages :: !*File -> (!CompilerMsg,!Bool,!List String,!*File)
ReadErrorAndWarningMessages file
#! (string, file1) = freadline file
......@@ -495,7 +494,6 @@ ReadErrorAndWarningMessages file
# (path_error,_,errlist,file3) = ReadErrorAndWarningMessages file2
= (if is_import_error (Patherror path) path_error,True,Strip string:!errlist,file3)
MakeCompilerOptionsString :: !CompileOrCheckSyntax !Bool !Bool !Bool !CompilerOptions -> String
MakeCompilerOptionsString compileOrCheckSyntax projectMemoryProfiling projectTimeProfiling projectEagerOrDynamic
{neverMemoryProfile, neverTimeProfile,sa,gw,gc,listTypes,attr,reuseUniqueNodes,fusion}
......@@ -724,10 +722,8 @@ Link linker` winfun path
, gen_dll = gen_dll
, dll_names = dll_syms
, dynamics_path = startupdir +++. DirSeparatorString +++. dynlstr
, lib_name_obj_path = MakeFullPathname tooltempdir "lib_name.o"
}
# linkerpath = RemoveFilename linker
// # linkoptspath = MakeFullPathname linkerpath "linkopts"
// # linkerrspath = MakeFullPathname linkerpath "linkerrs"
# linkoptspath = MakeFullPathname tooltempdir "linkopts"
# linkerrspath = MakeFullPathname tooltempdir "linkerrs"
# (err,ps) = accFiles (WriteLinkOpts linkoptspath linkopts) ps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment