Commit 4dfece48 authored by John van Groningen's avatar John van Groningen
Browse files

link _startup.o for solaris

parent d7f52197
...@@ -3173,8 +3173,9 @@ static int link_project_toolserver (P_NODE first_project_node,char *options_file ...@@ -3173,8 +3173,9 @@ static int link_project_toolserver (P_NODE first_project_node,char *options_file
return 1; return 1;
} }
#else #endif
# ifndef MAKE_MPW_TOOL
#if !(defined (MAKE_MPW_TOOL) || defined (USE_TOOLSERVER))
static int link_project (P_NODE first_project_node,char *options_file_name,char *application_file_name) static int link_project (P_NODE first_project_node,char *options_file_name,char *application_file_name)
{ {
...@@ -3209,7 +3210,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char ...@@ -3209,7 +3210,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
# endif # endif
# if defined (_WINDOWS_) || defined (OS2) # if defined (_WINDOWS_) || defined (OS2)
char stack_option[32]; char stack_option[32];
#endif # endif
# if defined (USE_CLEANLINKER) # if defined (USE_CLEANLINKER)
char kernel32_file_name[PATH_NAME_STRING_SIZE]; char kernel32_file_name[PATH_NAME_STRING_SIZE];
char user32_file_name[PATH_NAME_STRING_SIZE]; char user32_file_name[PATH_NAME_STRING_SIZE];
...@@ -3241,11 +3242,8 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char ...@@ -3241,11 +3242,8 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
*arg++="linker"; *arg++="linker";
*arg++=linker_output_object_file_name; *arg++=linker_output_object_file_name;
"a.o";
# if !(!defined (LINUX) && defined (SOLARIS))
need_file ("_startup",OBJECT_FILE_EXTENSION,start_up_file_name); need_file ("_startup",OBJECT_FILE_EXTENSION,start_up_file_name);
# endif
*arg++=start_up_file_name; *arg++=start_up_file_name;
need_file ("_system",OBJECT_FILE_EXTENSION,system_file_name); need_file ("_system",OBJECT_FILE_EXTENSION,system_file_name);
...@@ -3306,6 +3304,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char ...@@ -3306,6 +3304,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
} }
r=wait_for_child (pid, "Linker",&status); r=wait_for_child (pid, "Linker",&status);
if (!(r>=0 && status==0)) if (!(r>=0 && status==0))
return 0; return 0;
} }
...@@ -3352,7 +3351,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char ...@@ -3352,7 +3351,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
while ((ld_arg=parse_word (&rest))!=NULL) while ((ld_arg=parse_word (&rest))!=NULL)
*arg++=ld_arg; *arg++=ld_arg;
} }
#
# ifdef M68000 # ifdef M68000
*arg++="-N"; *arg++="-N";
# endif # endif
...@@ -3674,7 +3673,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char ...@@ -3674,7 +3673,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
*arg++ = user32_file_name; *arg++ = user32_file_name;
strcpy (gdi32_file_name,"-l"); strcpy (gdi32_file_name,"-l");
strcat (gdi32_file_name,clean_lib_path); strcat (gdi32_file_name,clean_lib_path);
~ strcat (gdi32_file_name,"\\gdi_library"); strcat (gdi32_file_name,"\\gdi_library");
*arg++ = gdi32_file_name; *arg++ = gdi32_file_name;
# else # else
*arg++="-lkernel32"; *arg++="-lkernel32";
...@@ -3747,7 +3746,6 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char ...@@ -3747,7 +3746,6 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
# endif # endif
# endif # endif
} }
# endif
#endif #endif
static void print_version (void) static void print_version (void)
......
Supports Markdown
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