Fixed MXE build

diff --git a/Makefile b/Makefile
index f408c40fd62996784c7717f96b7e53efa1f9eebd..a43f378e1087f8fcace5559243f95deae82c9659 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
 LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
 LDLIBS := $(filter-out -lrt,$(LDLIBS))
 ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -x c++ -fpermissive -w"
-ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" READLINE=0
+ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" READLINE=0 CC="$(CXX)" CXX="$(CXX)"
 EXE = .exe
 
 else ifneq ($(CONFIG),none)

diff --git a/kernel/log.cc b/kernel/log.cc
index 2cae6a63628e579b0d05cbed216fdf0a98bfdb72..19eb38c736db1f5002ad156cd1d31618e3d5ca92 100644 (file)
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -21,7 +21,7 @@
 #include "libs/sha1/sha1.h"
 #include "backends/ilang/ilang_backend.h"
 
-#ifndef _WIN32
+#if !defined(_WIN32) || defined(__MINGW32__)
 #  include <sys/time.h>
 #endif
 
@@ -51,7 +51,7 @@ static struct timeval initial_tv = { 0, 0 };
 static bool next_print_log = false;
 static int log_newline_count = 0;
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 // this will get time information and return it in timeval, simulating gettimeofday()
 int gettimeofday(struct timeval *tv, struct timezone *tz)
 {