Mercurial > urweb

diff src/compiler.sml @ 1871:c3119c263bd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add -ccompiler command line argument This allows user to overwrite the compiler set during the configure phase
author Sergey Mironov <grrwlf@gmail.com>
date Tue, 20 Aug 2013 17:13:50 +0400
parents d6b0ee53dc93
children 9a1097954188
line wrap: on
line diff
--- a/src/compiler.sml	Tue Oct 01 07:33:20 2013 -0400
+++ b/src/compiler.sml	Tue Aug 20 17:13:50 2013 +0400
@@ -1479,12 +1479,12 @@
                   else
                       " -O3"
 
-        val compile = Config.ccompiler ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " -Wimplicit -Werror -Wno-unused-value"
+        val compile = (Settings.getCCompiler ()) ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " -Wimplicit -Werror -Wno-unused-value"
                       ^ opt ^ " -I " ^ !Settings.configInclude
                       ^ " " ^ #compile proto
                       ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname
 
-        val linker = Option.getOpt (linker, Config.ccompiler ^ " -Werror" ^ opt ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " " ^ Config.pthreadLibs)
+        val linker = Option.getOpt (linker, (Settings.getCCompiler ()) ^ " -Werror" ^ opt ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " " ^ Config.pthreadLibs)
 
         val ssl = if Settings.getStaticLinking () then
                       Config.openssl ^ " -ldl -lz"