From a4a3ed12195be401672f1418d8cd909e46b2e028 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 2 Feb 2020 13:35:09 +0300 Subject: Makefile: get rid of TRAVIS_BUILD_DIR where unnecessary --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 64d9463..99d4692 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ endif ifeq ($(windows),1) # Make might pick up sh.exe if it's available: SHELL := cmd +.SHELLFLAGS := /c else SHELL := bash .SHELLFLAGS := -eu -o pipefail -c @@ -51,8 +52,9 @@ x64_args = -A x64 x86_args = -A Win32 install_prefix = C:/install else -x64_args := -D "CMAKE_TOOLCHAIN_FILE=$$TRAVIS_BUILD_DIR/cmake/toolchains/gcc-x64.cmake" -x86_args := -D "CMAKE_TOOLCHAIN_FILE=$$TRAVIS_BUILD_DIR/cmake/toolchains/gcc-x86.cmake" +makefile_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) +x64_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/cmake/toolchains/gcc-x64.cmake" +x86_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/cmake/toolchains/gcc-x86.cmake" install_prefix := $$HOME/install endif -- cgit v1.2.3