fix indentation Unix/PmCleanSystem.icl

Unix/PmCleanSystem.icl

@@ -397,117 +397,117 @@ Link linker winfun path
 	| len >= 12 && linker % (len - 12, len) == "/usr/bin/gcc"
 		= linkGCC object_paths options2 ps
 		= linkOther linker object_paths ps
-where
-	//First call the optimizing linker to generate an intermediate optimized object file which is then passed to gcc
-	linkOptimizingGCC linker object_paths options1 options2 ps
-	# temp_file_name = "/tmp/linkerXXXXXX" +++ "\0" // +++ because modified by mkstemp
-	# fd = mkstemp temp_file_name
-	| fd== -1
-		= abort "mkstemp failed\n"
-	# r = close fd
-	| r== -1
-		= abort "close failed\n"
-	//Call optimized linker
-	# 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
-	| linker_pid<0
-		= abort "fork failed\n"
-	| linker_pid==0
-		| execv (linker+++"\0") argv<0
-			= abort "execv failed\n"
-			= abort "execution continued after execv\n"
-	# (w_pid,status) = wait_pid linker_pid 0
-	| w_pid <> -1 && w_pid<>linker_pid
-		= abort "waitpid failed\n"
-	# exit_code = (status >> 8) bitand 0xff
-	# wtermsig = status bitand 0x7f
-	| wtermsig<>0
-		= abort "linker exited abnormally\n"
-	| free args_memory<0
-		= abort "free failed\n"
-
-	# link_ok = exit_code==0
-	| not link_ok
-		| unlink (temp_file_name+++"\0")<>0
-			=  (ps,link_ok)
-			=  (ps,link_ok)
-	//Call gcc
-	= linkGCC [temp_file_name] options2 ps
-
-	//Just link with gcc
-	linkGCC object_paths gccOptions ps
-	# gcc_options = add_options_string_to_args 0 gccOptions (StrictListToList (Append library_file_names "-lm"))
-	# ld_args = ["-o", path : object_paths ] ++ gcc_options
-	  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"
-	# (argv,args_memory) = make_argv [ld:ld_args]
-	# ld_pid = fork
-	| ld_pid<0
-		= abort "fork failed\n"
-	| ld_pid==0
-		| execv (ld+++"\0") argv<0
-			= abort "execv failed\n"
-			= abort "execution continued after execv\n"
-	| free args_memory<0
-		= abort "free failed\n"
-	# (w_pid,status) = wait_pid ld_pid 0
-	| w_pid <> -1 && w_pid<>ld_pid
-		= abort "waitpid failed\n"
-	# wtermsig = status bitand 0x7f
-	# exit_code = (status >> 8) bitand 0xff;
-	| wtermsig<>0
-		= abort "ld exited abnormally\n"
-	# link_ok = exit_code==0
-	= (ps,link_ok)
-
-	//Call other/additional linker
-	linkOther linker object_paths ps
-	# linkopts  =
-		{ exe_path                  = path
-		, res_path                  = resource_path
-		, open_console              = o <> NoConsole
-		, static_link               = static
-		, gen_relocs                = gen_relocs
-		, gen_symbol_table          = gen_symbol_table
-		, gen_linkmap               = gen_linkmap
-		, link_resources            = link_resources
-		, object_paths              = ListToStrictList object_paths
-		, dynamic_libs              = RemoveDup library_file_names
-		, static_libs               = RemoveDup static_libraries
-		, stack_size                = ss
-		, gen_dll                   = gen_dll
-		, dll_names                 = dll_syms
-		, dynamics_path             = startupdir +++. DirSeparatorString +++. dynlstr
-		, lib_name_obj_path         = MakeFullPathname tooltempdir "lib_name.o"
-		}
-	# linkoptspath = MakeFullPathname tooltempdir "linkopts"
-	# linkerrspath = MakeFullPathname tooltempdir "linkerrs"
-	# (err,ps) = accFiles (WriteLinkOpts linkoptspath linkopts) ps
-	| isJust err
-		= (winfun (fromJust err) ps,False)
-	# linker_args = ["-I",linkoptspath,"-O",linkerrspath]
-	# (argv,args_memory) = make_argv [linker:linker_args]
-	# linker_pid = fork
-	| linker_pid<0
-		= abort "fork failed\n"
-	| linker_pid==0
-		| execv (linker+++"\0") argv<0
-			= abort "execv failed\n"
-			= abort "execution continued after execv\n"
-	# (w_pid,status) = wait_pid linker_pid 0
-	| w_pid <> -1 && w_pid<>linker_pid
-		= abort "waitpid failed\n"
-	# exit_code = (status >> 8) bitand 0xff
-	# wtermsig = status bitand 0x7f
-	| wtermsig<>0
-		= abort "linker exited abnormally\n"
-	| free args_memory<0
-		= abort "free failed\n"
-	# link_ok = exit_code==0
-	= (ps,link_ok)
+	where
+		//First call the optimizing linker to generate an intermediate optimized object file which is then passed to gcc
+		linkOptimizingGCC linker object_paths options1 options2 ps
+			# temp_file_name = "/tmp/linkerXXXXXX" +++ "\0" // +++ because modified by mkstemp
+			# fd = mkstemp temp_file_name
+			| fd== -1
+				= abort "mkstemp failed\n"
+			# r = close fd
+			| r== -1
+				= abort "close failed\n"
+			//Call optimized linker
+			# 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
+			| linker_pid<0
+				= abort "fork failed\n"
+			| linker_pid==0
+				| execv (linker+++"\0") argv<0
+					= abort "execv failed\n"
+					= abort "execution continued after execv\n"
+			# (w_pid,status) = wait_pid linker_pid 0
+			| w_pid <> -1 && w_pid<>linker_pid
+				= abort "waitpid failed\n"
+			# exit_code = (status >> 8) bitand 0xff
+			# wtermsig = status bitand 0x7f
+			| wtermsig<>0
+				= abort "linker exited abnormally\n"
+			| free args_memory<0
+				= abort "free failed\n"
+
+			# link_ok = exit_code==0
+			| not link_ok
+				| unlink (temp_file_name+++"\0")<>0
+					=  (ps,link_ok)
+					=  (ps,link_ok)
+			//Call gcc
+			= linkGCC [temp_file_name] options2 ps
+
+		//Just link with gcc
+		linkGCC object_paths gccOptions ps
+			# gcc_options = add_options_string_to_args 0 gccOptions (StrictListToList (Append library_file_names "-lm"))
+			# ld_args = ["-o", path : object_paths ] ++ gcc_options
+			  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"
+			# (argv,args_memory) = make_argv [ld:ld_args]
+			# ld_pid = fork
+			| ld_pid<0
+				= abort "fork failed\n"
+			| ld_pid==0
+				| execv (ld+++"\0") argv<0
+					= abort "execv failed\n"
+					= abort "execution continued after execv\n"
+			| free args_memory<0
+				= abort "free failed\n"
+			# (w_pid,status) = wait_pid ld_pid 0
+			| w_pid <> -1 && w_pid<>ld_pid
+				= abort "waitpid failed\n"
+			# wtermsig = status bitand 0x7f
+			# exit_code = (status >> 8) bitand 0xff;
+			| wtermsig<>0
+				= abort "ld exited abnormally\n"
+			# link_ok = exit_code==0
+			= (ps,link_ok)
+
+		//Call other/additional linker
+		linkOther linker object_paths ps
+			# linkopts  =
+				{ exe_path                  = path
+				, res_path                  = resource_path
+				, open_console              = o <> NoConsole
+				, static_link               = static
+				, gen_relocs                = gen_relocs
+				, gen_symbol_table          = gen_symbol_table
+				, gen_linkmap               = gen_linkmap
+				, link_resources            = link_resources
+				, object_paths              = ListToStrictList object_paths
+				, dynamic_libs              = RemoveDup library_file_names
+				, static_libs               = RemoveDup static_libraries
+				, stack_size                = ss
+				, gen_dll                   = gen_dll
+				, dll_names                 = dll_syms
+				, dynamics_path             = startupdir +++. DirSeparatorString +++. dynlstr
+				, lib_name_obj_path         = MakeFullPathname tooltempdir "lib_name.o"
+				}
+			# linkoptspath = MakeFullPathname tooltempdir "linkopts"
+			# linkerrspath = MakeFullPathname tooltempdir "linkerrs"
+			# (err,ps) = accFiles (WriteLinkOpts linkoptspath linkopts) ps
+			| isJust err
+				= (winfun (fromJust err) ps,False)
+			# linker_args = ["-I",linkoptspath,"-O",linkerrspath]
+			# (argv,args_memory) = make_argv [linker:linker_args]
+			# linker_pid = fork
+			| linker_pid<0
+				= abort "fork failed\n"
+			| linker_pid==0
+				| execv (linker+++"\0") argv<0
+					= abort "execv failed\n"
+					= abort "execution continued after execv\n"
+			# (w_pid,status) = wait_pid linker_pid 0
+			| w_pid <> -1 && w_pid<>linker_pid
+				= abort "waitpid failed\n"
+			# exit_code = (status >> 8) bitand 0xff
+			# wtermsig = status bitand 0x7f
+			| wtermsig<>0
+				= abort "linker exited abnormally\n"
+			| free args_memory<0
+				= abort "free failed\n"
+			# link_ok = exit_code==0
+			= (ps,link_ok)
 
 DelayEventLoop :: !.ps -> .ps
 DelayEventLoop ps