1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 00:33:09 +00:00

Revert "Allow cross compilation of Windows binaries on a Linux system"

This reverts commit 388630ae28.

Confuses fishtest build system
This commit is contained in:
Joona Kiiski 2015-11-24 17:24:45 -08:00
parent 388630ae28
commit 5339ab57d8

View file

@ -159,11 +159,7 @@ endif
ifeq ($(COMP),mingw)
comp=mingw
ifeq ($(UNAME),Linux)
CXX=x86_64-w64-mingw32-g++-posix
else
CXX=g++
endif
CXX=g++
CXXFLAGS += -Wextra -Wshadow
LDFLAGS += -static
endif
@ -311,7 +307,7 @@ ifeq ($(pext),yes)
endif
endif
### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw under windows.
### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw.
### This is a mix of compile and link time options because the lto link phase
### needs access to the optimization flags.
ifeq ($(comp),gcc)
@ -323,17 +319,6 @@ ifeq ($(comp),gcc)
endif
endif
ifeq ($(UNAME),Linux)
ifeq ($(comp),mingw)
ifeq ($(optimize),yes)
ifeq ($(debug),no)
CXXFLAGS += -flto
LDFLAGS += $(CXXFLAGS)
endif
endif
endif
endif
### 3.12 Android 5 can only run position independent executables. Note that this
### breaks Android 4.0 and earlier.
ifeq ($(arch),armv7)