From f8650aebd58be6c004d34cde4bb142aca8cfbefb Mon Sep 17 00:00:00 2001 From: jeefo Date: Fri, 16 Sep 2016 17:05:04 +0300 Subject: [PATCH] okay, travis. flto removed. --- .travis.yml | 1 - project/makefile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index da90572..913b045 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ branches: compiler: - clang before_script: - - sudo ln -sf /usr/lib/llvm-3.8/lib/LLVMgold.so /usr/lib/LLVMgold.so && echo /usr/lib/llvm-3.8/lib >> /etc/ld.so.conf && ldconfig - sudo wget $OSX_CROSS_TOOL -O /tmp/osxcross.tgz && mkdir -p /tmp/osxcross/target && tar xzf /tmp/osxcross.tgz -C /tmp/osxcross/target/ - export PATH=$PATH:/tmp/osxcross/target/bin - wget https://yapb.jeefo.net/ci/scripts/gitrev.sh && chmod a+x ./gitrev.sh && ./gitrev.sh diff --git a/project/makefile b/project/makefile index ef89245..0bbc3f5 100644 --- a/project/makefile +++ b/project/makefile @@ -22,7 +22,7 @@ OBJECTS = $(SRC_DIR)/basecode.cpp \ $(SRC_DIR)/support.cpp \ $(SRC_DIR)/waypoint.cpp \ -C_OPT_FLAGS = -Ofast -DNDEBUG -pipe -flto -fno-strict-aliasing -mtune=generic +C_OPT_FLAGS = -Ofast -DNDEBUG -pipe -fno-strict-aliasing -mtune=generic C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3 C_GCC_FLAGS = -fvisibility=hidden @@ -52,7 +52,7 @@ else LINK += -shared endif -LINK += -m32 -lm -ldl -flto +LINK += -m32 -lm -ldl CFLAGS += -msse2 -std=c++11 -m32 -Wall -Werror -Wextra CPPFLAGS += -fno-exceptions -fno-rtti