Fixed cross-compile using mingw 64 bit under Windows 10 Linux subsystem (Ubunto 14.04)
Should work with true Ubuntu 14.04 as-is.
This commit is contained in:
parent
063ae77568
commit
2127680e49
|
|
@ -70,7 +70,6 @@ dllib=@DLLIB@
|
||||||
HOSTCC = @CC@
|
HOSTCC = @CC@
|
||||||
HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
|
HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
|
||||||
|
|
||||||
CC = @CC@
|
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
DLLTOOL = @DLLTOOL@
|
DLLTOOL = @DLLTOOL@
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
|
|
@ -129,7 +128,7 @@ all: dep config.h _pli_types.h version_tag.h ivl@EXEEXT@ version.exe iverilog-vp
|
||||||
ifeq (@MINGW32@,yes)
|
ifeq (@MINGW32@,yes)
|
||||||
all: dosify.exe
|
all: dosify.exe
|
||||||
dosify.exe: $(srcdir)/dosify.c
|
dosify.exe: $(srcdir)/dosify.c
|
||||||
$(HOSTCC) $(HOSTCFLAGS) -o dosify.exe $(srcdir)/dosify.c
|
$(CC) $(CFLAGS) -o dosify.exe $(srcdir)/dosify.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# This rule rules the compiler in the trivial hello.vl program to make
|
# This rule rules the compiler in the trivial hello.vl program to make
|
||||||
|
|
@ -239,7 +238,7 @@ iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile
|
||||||
endif
|
endif
|
||||||
|
|
||||||
version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
|
version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
|
||||||
$(HOSTCC) $(HOSTCFLAGS) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
|
$(CC) $(CFLAGS) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
|
||||||
|
|
||||||
%.o: %.cc config.h
|
%.o: %.cc config.h
|
||||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||||
|
|
|
||||||
|
|
@ -225,6 +225,8 @@ AC_DEFUN([AX_C99_STRTOD],
|
||||||
[# On MinGW we need to jump through hoops to get a C99 compliant strtod().
|
[# On MinGW we need to jump through hoops to get a C99 compliant strtod().
|
||||||
# mingw-w64 doesn't need this, and the 64-bit version doesn't support it.
|
# mingw-w64 doesn't need this, and the 64-bit version doesn't support it.
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
|
x86_64-w64-mingw32)
|
||||||
|
;;
|
||||||
*-*-mingw32)
|
*-*-mingw32)
|
||||||
LDFLAGS+=" -Wl,--undefined=___strtod,--wrap,strtod,--defsym,___wrap_strtod=___strtod"
|
LDFLAGS+=" -Wl,--undefined=___strtod,--wrap,strtod,--defsym,___wrap_strtod=___strtod"
|
||||||
;;
|
;;
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ includedir = @includedir@
|
||||||
HOSTCC = @CC@
|
HOSTCC = @CC@
|
||||||
HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
|
HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
|
||||||
|
|
||||||
CC = @CC@
|
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
DLLTOOL = @DLLTOOL@
|
DLLTOOL = @DLLTOOL@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
|
|
@ -153,7 +152,7 @@ endif
|
||||||
mv $*.d dep/$*.d
|
mv $*.d dep/$*.d
|
||||||
|
|
||||||
tables.cc: $(srcdir)/draw_tt.c
|
tables.cc: $(srcdir)/draw_tt.c
|
||||||
$(HOSTCC) $(HOSTCFLAGS) -o draw_tt.exe $(srcdir)/draw_tt.c
|
$(CC) $(CFLAGS) -o draw_tt.exe $(srcdir)/draw_tt.c
|
||||||
./draw_tt.exe > tables.cc
|
./draw_tt.exe > tables.cc
|
||||||
rm draw_tt.exe
|
rm draw_tt.exe
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue