diff options
author | Adam Chlipala <adam@chlipala.net> | 2011-06-17 11:52:56 -0400 |
---|---|---|
committer | Adam Chlipala <adam@chlipala.net> | 2011-06-17 11:52:56 -0400 |
commit | 9616a2fb8ede074fd0d2adbd680c34e2a569b08c (patch) | |
tree | a3633f2881fd06b9aeb9243d5115360039de613f /src | |
parent | 8d6c0435d5f8ff60106210611c657d050fb8168b (diff) |
Fixes to work nicely with OS X and Clang (thanks to Austin Seipp)
Diffstat (limited to 'src')
-rw-r--r-- | src/c/Makefile.am | 2 | ||||
-rw-r--r-- | src/c/Makefile.in | 2 | ||||
-rw-r--r-- | src/c/urweb.c | 2 | ||||
-rw-r--r-- | src/compiler.sml | 4 | ||||
-rw-r--r-- | src/config.sig | 1 | ||||
-rw-r--r-- | src/config.sml.in | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/src/c/Makefile.am b/src/c/Makefile.am index 613c2452..04fe6bf0 100644 --- a/src/c/Makefile.am +++ b/src/c/Makefile.am @@ -6,4 +6,4 @@ liburweb_cgi_la_SOURCES = cgi.c liburweb_fastcgi_la_SOURCES = fastcgi.c AM_CPPFLAGS = -I../../include @OPENSSL_INCLUDES@ -AM_CFLAGS = -Wimplicit -Wall -Werror +AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security diff --git a/src/c/Makefile.in b/src/c/Makefile.in index b13b94f9..ad8c1115 100644 --- a/src/c/Makefile.in +++ b/src/c/Makefile.in @@ -237,7 +237,7 @@ liburweb_http_la_SOURCES = http.c liburweb_cgi_la_SOURCES = cgi.c liburweb_fastcgi_la_SOURCES = fastcgi.c AM_CPPFLAGS = -I../../include @OPENSSL_INCLUDES@ -AM_CFLAGS = -Wimplicit -Wall -Werror +AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security all: all-am .SUFFIXES: diff --git a/src/c/urweb.c b/src/c/urweb.c index 3213d044..b653390a 100644 --- a/src/c/urweb.c +++ b/src/c/urweb.c @@ -829,7 +829,7 @@ static input *check_input_space(uw_context ctx, size_t len) { r = &ctx->subinputs[ctx->used_subinputs]; for (i = 0; i < len; ++i) - ctx->subinputs[ctx->used_subinputs++].kind = UNUSED; + ctx->subinputs[ctx->used_subinputs++].kind = UNSET; return r; } diff --git a/src/compiler.sml b/src/compiler.sml index 27529251..75fc015f 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -1318,11 +1318,11 @@ fun compileC {cname, oname, ename, libs, profile, debug, link = link'} = else "-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto - val compile = "gcc " ^ Config.gccArgs ^ " -Wimplicit -Werror -O3 -fno-inline -I " ^ Config.includ + val compile = Config.ccompiler ^ " " ^ Config.gccArgs ^ " -Wimplicit -Werror -O3 -fno-inline -I " ^ Config.includ ^ " " ^ #compile proto ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname - val link = "gcc -Werror -O3 -lm -pthread " ^ Config.gccArgs ^ " " ^ lib ^ " " ^ Config.openssl ^ " " ^ escapeFilename oname + val link = Config.ccompiler ^ " -Werror -O3 -lm -pthread " ^ Config.gccArgs ^ " " ^ lib ^ " " ^ Config.openssl ^ " " ^ escapeFilename oname ^ " -o " ^ escapeFilename ename ^ " " ^ libs val (compile, link) = diff --git a/src/config.sig b/src/config.sig index 28479ef0..da26da2f 100644 --- a/src/config.sig +++ b/src/config.sig @@ -8,6 +8,7 @@ signature CONFIG = sig val libC : string val libJs : string + val ccompiler : string val gccArgs : string val openssl : string diff --git a/src/config.sml.in b/src/config.sml.in index fa4bd5fa..3fc492ab 100644 --- a/src/config.sml.in +++ b/src/config.sml.in @@ -12,6 +12,7 @@ val libC = OS.Path.joinDirFile {dir = lib, val libJs = OS.Path.joinDirFile {dir = lib, file = "js"} +val ccompiler = "@CC@" val gccArgs = "@GCCARGS@" val openssl = "@OPENSSL_LDFLAGS@ @OPENSSL_LIBS@" |