diff --git a/MacOSX/PmCleanSystem.icl b/MacOSX/PmCleanSystem.icl
index 1202e7f579a5cf64cf177d7d71aaf035c68889fe..1b21bf1e85300d0845d68a76158824e36303f441 100644
--- a/MacOSX/PmCleanSystem.icl
+++ b/MacOSX/PmCleanSystem.icl
@@ -403,7 +403,7 @@ Link linker winfun path
 		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
 		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
 	# optdirpath				= RemoveFilename optionspathname
 	# ((ok,pd_optdirpath),ps)	= pd_StringToPath optdirpath ps
@@ -442,8 +442,8 @@ Link linker winfun path
 	# (err,ps) = if is_gcc (Nothing,ps) (accFiles (WriteLinkOpts linkoptspath linkopts) ps)
 	| isJust err
 		= (winfun (fromJust err) ps,False)
-	# linker_args = if is_gcc ["-s","-o", path: [optionspathname : StrictListToList (RemoveDup object_file_names)]++StrictListToList library_file_names]
-							  ["-I",linkoptspath,"-O",linkerrspath]
+	# 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)]
+							  (add_options_string_to_args 0 options1 ["-I",linkoptspath,"-O",linkerrspath])
 	# (argv,args_memory) = make_argv [linker:linker_args]
 	# ld_pid = fork
 	| ld_pid<0
diff --git a/Unix/PmCleanSystem.icl b/Unix/PmCleanSystem.icl
index 3860cc5ac45c9cca25e4d4bb75b98e007f468046..8f266a71b0e807af22c7f361106da51d68c5692b 100644
--- a/Unix/PmCleanSystem.icl
+++ b/Unix/PmCleanSystem.icl
@@ -375,7 +375,7 @@ Link linker winfun path
 		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
 		link_resources resource_path gen_dll dll_syms startupdir dynlstr _ use_64_bit_processor ps
-	# (linker,linker_dir,opts) = get_path_name_and_options linker startupdir
+	# (linker,linker_dir,options1,options2) = get_path_name_and_options2 linker startupdir
 	# flags = ApplicationOptionsToFlags applicationOptions
 	  optdirpath = RemoveFilename optionspathname
 	  ((ok,pd_optdirpath),ps) = pd_StringToPath optdirpath ps
@@ -403,7 +403,7 @@ Link linker winfun path
 		| r== -1
 			= abort "close failed\n"
 		//Call optimized linker
-		# linker_args = [temp_file_name:object_paths]
+		# linker_args = add_options_string_to_args 0 options1 [temp_file_name:object_paths]
 		# (argv,args_memory) = make_argv [linker:linker_args]
 
 		# linker_pid = fork
@@ -429,7 +429,7 @@ Link linker winfun path
 				=  (ps,link_ok)
 				=  (ps,link_ok)
 		//Call gcc
-		# ld_args = ["-o",path,temp_file_name:add_options_string_to_args 0 opts (StrictListToList (Append library_file_names "-lm"))]
+		# ld_args = ["-o",path,temp_file_name:add_options_string_to_args 0 options2 (StrictListToList (Append library_file_names "-lm"))]
 		  ld_args = IF_MACOSX ld_args (IF_INT_64_OR_32 ["-no-pie":ld_args] ld_args)
 		  ld_args = if gen_symbol_table ld_args ["-s":ld_args]
 		# ld = "/usr/bin/gcc"