Commit fb6b8d97 authored by Build's avatar Build Committed by Mart Lubbers

support double flags for mac as well

parent 06f55a97
Pipeline #17647 passed with stage
in 55 seconds
...@@ -403,7 +403,7 @@ Link linker winfun path ...@@ -403,7 +403,7 @@ Link linker winfun path
applicationOptions=:{ss,hs,initial_heap_size,profiling,heap_size_multiple,o,memoryProfilingMinimumHeapSize=minheap} applicationOptions=:{ss,hs,initial_heap_size,profiling,heap_size_multiple,o,memoryProfilingMinimumHeapSize=minheap}
optionspathname library_file_names object_file_names static_libraries static gen_relocs gen_symbol_table gen_linkmap optionspathname library_file_names object_file_names static_libraries static gen_relocs gen_symbol_table gen_linkmap
link_resources resource_path gen_dll dll_syms startupdir dynlstr _ use_64_bit_processor ps link_resources resource_path gen_dll dll_syms startupdir dynlstr _ use_64_bit_processor ps
# (linker,linkerdir,_) = get_path_name_and_options linker startupdir # (linker,linkerdir,options1,options2) = get_path_name_and_options2 linker ""
# flags = ApplicationOptionsToFlags applicationOptions # flags = ApplicationOptionsToFlags applicationOptions
# optdirpath = RemoveFilename optionspathname # optdirpath = RemoveFilename optionspathname
# ((ok,pd_optdirpath),ps) = pd_StringToPath optdirpath ps # ((ok,pd_optdirpath),ps) = pd_StringToPath optdirpath ps
...@@ -442,8 +442,8 @@ Link linker winfun path ...@@ -442,8 +442,8 @@ Link linker winfun path
# (err,ps) = if is_gcc (Nothing,ps) (accFiles (WriteLinkOpts linkoptspath linkopts) ps) # (err,ps) = if is_gcc (Nothing,ps) (accFiles (WriteLinkOpts linkoptspath linkopts) ps)
| isJust err | isJust err
= (winfun (fromJust err) ps,False) = (winfun (fromJust err) ps,False)
# linker_args = if is_gcc ["-s","-o", path: [optionspathname : StrictListToList (RemoveDup object_file_names)]++StrictListToList library_file_names] # linker_args = if is_gcc ["-s","-o", path: [optionspathname : StrictListToList (RemoveDup object_file_names)]++add_options_string_to_args 0 options2 (StrictListToList library_file_names)]
["-I",linkoptspath,"-O",linkerrspath] (add_options_string_to_args 0 options1 ["-I",linkoptspath,"-O",linkerrspath])
# (argv,args_memory) = make_argv [linker:linker_args] # (argv,args_memory) = make_argv [linker:linker_args]
# ld_pid = fork # ld_pid = fork
| ld_pid<0 | ld_pid<0
......
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