Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Make build system search for toolchain in source dir too

This commit is contained in:
mintsuki 2022-02-10 22:36:50 +01:00
parent 9afaa5fad8
commit 459029eedf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile.in
View File

@ -13,7 +13,7 @@ MKESCAPE = $(subst $(SPACE),\ ,$(1))
SHESCAPE = $(subst ','\'',$(1))
NASMESCAPE = $(subst ','"'$(COMMA) \"'\"$(COMMA) '"',$(1))
override PATH := $(BUILDDIR)/toolchain/bin:/usr/local/bin:$(PATH)
override PATH := $(SRCDIR)/toolchain/bin:$(BUILDDIR)/toolchain/bin:/usr/local/bin:$(PATH)
export PATH
override BUILD_ELTORITO_EFI := @build_eltorito_efi@

5
configure.ac
View File

@ -4,8 +4,9 @@ AC_PREREQ(2.69)
AC_CONFIG_AUX_DIR([build-aux])
TOOLCHAIN_DIR="$(pwd -P)/toolchain/bin"
PATH="$TOOLCHAIN_DIR$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH"
SOURCE_DIR="$(cd "$srcdir" && pwd -P)"
BUILD_DIR="$(pwd -P)"
PATH="$BUILD_DIR/toolchain/bin$PATH_SEPARATOR$SOURCE_DIR/toolchain/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH"
export PATH
test "x$CFLAGS" = "x" && CFLAGS='-g -O2 -pipe -Wall -Wextra'