vala r1728 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Wed Jul 30 21:31:49 2008
New Revision: 1728
URL: http://svn.gnome.org/viewvc/vala?rev=1728&view=rev

Log:
2008-07-30  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodecompiler.vala:

	Fix linking with --as-needed and on Windows,
	patch by Yaakov Selkowitz, fixes bug 545427


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodecompiler.vala

Modified: trunk/gobject/valaccodecompiler.vala
==============================================================================
--- trunk/gobject/valaccodecompiler.vala	(original)
+++ trunk/gobject/valaccodecompiler.vala	Wed Jul 30 21:31:49 2008
@@ -93,10 +93,6 @@
 			}
 			cmdline += " -o " + Shell.quote (output);
 		}
-		cmdline += " " + pkgflags;
-		foreach (string cc_option in cc_options) {
-			cmdline += " " + Shell.quote (cc_option);
-		}
 
 		/* make sure include files can be found if -d is used */
 		if (context.directory != null && context.directory != "") {
@@ -115,6 +111,13 @@
 			cmdline += " " + Shell.quote (file);
 		}
 
+		// add libraries after source files to fix linking
+		// with --as-needed and on Windows
+		cmdline += " " + pkgflags;
+		foreach (string cc_option in cc_options) {
+			cmdline += " " + Shell.quote (cc_option);
+		}
+
 		try {
 			Process.spawn_command_line_sync (cmdline, null, null, out exit_status);
 			if (exit_status != 0) {