Mercurial > urweb

diff src/compiler.sml @ 1132:d4cd54a4ea06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First attempt to switch to Automake, to get shared libraries built in OSX
author Adam Chlipala <adamc@hcoop.net>
date Thu, 28 Jan 2010 09:56:08 -0500
parents c01fb6f1b31f
children 7fdea74b1dd9
line wrap: on
line diff
--- a/src/compiler.sml	Tue Jan 26 14:59:19 2010 -0500
+++ b/src/compiler.sml	Thu Jan 28 09:56:08 2010 -0500
@@ -1,4 +1,4 @@
-(* Copyright (c) 2008-2009, Adam Chlipala
+(* Copyright (c) 2008-2010, Adam Chlipala
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1040,8 +1040,7 @@
         val proto = Settings.currentProtocol ()
 
         val lib = if Settings.getStaticLinking () then
-                      clibFile "request.o" ^ " " ^ clibFile "queue.o" ^ " " ^ clibFile "urweb.o"
-                      ^ " " ^ clibFile "memmem.o" ^ " " ^ clibFile "mhash.o" ^ " " ^ #linkStatic proto
+                      #linkStatic proto ^ " " ^ Config.lib ^ "/../liburweb.a"
                   else
                       "-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto