Skip to content

Commit

Permalink
Merge #220
Browse files Browse the repository at this point in the history
220: niminst: remove koch detection from build scripts r=alaviss a=alaviss

This function is used for placing csources compiler into the binary
directory of the compiler source. However, as csources is now fully
managed by koch.py, this functionality is obsolete.

Co-authored-by: Leorize <leorize+oss@disroot.org>
  • Loading branch information
bors[bot] and alaviss authored Jan 31, 2022
2 parents a60233a + 6dbe4c9 commit 4ffcce4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 12 deletions.
2 changes: 0 additions & 2 deletions tools/niminst/buildbat.nimf
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ IF DEFINED ARCH (
)
ECHO Building with %ARCH% bit %CC%

if EXIST ..\koch.nim SET BIN_DIR=..\bin

if NOT EXIST %BIN_DIR%\nul mkdir %BIN_DIR%

REM call the compiler:
Expand Down
4 changes: 0 additions & 4 deletions tools/niminst/buildsh.nimf
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ uosname=
# add(result, "# bin dir detection\n")
binDir=?{firstBinPath(c).toUnix}

if [ -s ../koch.nim ]; then
binDir="../bin"
fi

if [ ! -d $binDir ]; then
mkdir $binDir
fi
Expand Down
6 changes: 0 additions & 6 deletions tools/niminst/makefile.nimf
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ CC ??= gcc
CFLAGS += -Ic_code ?{c.ccompiler.flags}
LDFLAGS += ?{c.linker.flags}
binDir = ?{firstBinPath(c).toUnix}

koch := $(shell sh -c 'test -s ../koch.nim && echo "yes"')
ifeq ($(koch),yes)
binDir = ../bin
endif

target := ?{"$(binDir)/" & toLowerAscii(c.name)}

ucpu := $(shell sh -c 'uname -m | tr "[:upper:]" "[:lower:]"')
Expand Down

0 comments on commit 4ffcce4

Please sign in to comment.