From 5339ab57d80b19de3cb664b62fd40b626bc1634b Mon Sep 17 00:00:00 2001 From: Joona Kiiski Date: Tue, 24 Nov 2015 17:24:45 -0800 Subject: [PATCH] Revert "Allow cross compilation of Windows binaries on a Linux system" This reverts commit 388630ae285b3f9f0c8ee4f30e754bde6688c57c. Confuses fishtest build system --- src/Makefile | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/Makefile b/src/Makefile index a95f13b3..29b784e5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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) -- 2.39.2