Test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2015-01-15 15:01:31 -08:00
parent 5f32992b31
commit 42198c18f4
3 changed files with 2 additions and 5 deletions

View file

@ -51,7 +51,7 @@ endif
# Extra flags needed to compile a working executable with the standard library
ifdef IS_WINDOWS
EXTRACFLAGS :=
EXTRACFLAGS := -lws2_32
else
ifeq ($(shell uname),Darwin)
else