jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

niminst: get rid of LINKER / LD (#11379)

Browse source 
* niminst: get rid of LINKER / LD

They don't seem to be used anywhere, and clashes with *nix `$LD`
This commit is contained in:
alaviss 2019-06-03 13:45:52 +07:00 • committed by Andreas Rumpf
commit 1d1c72dfbb
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/niminst/buildsh.nimf
View file

@ -40,7 +40,6 @@ do
done done
CC="${CC:-gcc}" CC="${CC:-gcc}"
LINKER="${LD:-gcc}"
COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} ?{c.ccompiler.flags}$extraBuildArgs" COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} ?{c.ccompiler.flags}$extraBuildArgs"
LINK_FLAGS="${LDFLAGS:-} ?{c.linker.flags}" LINK_FLAGS="${LDFLAGS:-} ?{c.linker.flags}"
PS4="" PS4=""
@ -60,7 +59,7 @@ if [ ! -d $binDir ]; then
fi fi
# add(result, "# override OS, CPU and OS Name with command-line arguments\n") # add(result, "# override OS, CPU and OS Name with command-line arguments\n")
if [ -n "$optos" ]; then if [ -n "$optos" ]; then
uos="$optos" uos="$optos"
fi fi
if [ -n "$optcpu" ]; then if [ -n "$optcpu" ]; then
@ -87,7 +86,6 @@ case $uos in
*freebsd* ) *freebsd* )
myos="freebsd" myos="freebsd"
CC="clang" CC="clang"
LINKER="clang"
LINK_FLAGS="$LINK_FLAGS -lm" LINK_FLAGS="$LINK_FLAGS -lm"
;; ;;
*openbsd* ) *openbsd* )
@ -101,7 +99,6 @@ case $uos in
*darwin* ) *darwin* )
myos="macosx" myos="macosx"
CC="clang" CC="clang"
LINKER="clang"
LINK_FLAGS="$LINK_FLAGS -ldl -lm" LINK_FLAGS="$LINK_FLAGS -ldl -lm"
if [ "$HOSTTYPE" = "x86_64" ] ; then if [ "$HOSTTYPE" = "x86_64" ] ; then
ucpu="amd64" ucpu="amd64"
@ -209,7 +206,7 @@ case $myos in
$CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")} $CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}
# add(linkCmd, " \\\n" & changeFileExt(f, "o")) # add(linkCmd, " \\\n" & changeFileExt(f, "o"))
# end for # end for
$LINKER -o ?{"$binDir/" & toLowerAscii(c.name)} ?linkCmd $LINK_FLAGS $CC -o ?{"$binDir/" & toLowerAscii(c.name)} ?linkCmd $LINK_FLAGS
;; ;;
# end for # end for
*) *)

5
tools/niminst/makefile.nimf
View file

@ -5,7 +5,6 @@
# "# To regenerate run ``niminst csource`` or ``koch csource``\n" # "# To regenerate run ``niminst csource`` or ``koch csource``\n"
CC ??= gcc CC ??= gcc
LD ??= gcc
CFLAGS += -Ic_code ?{c.ccompiler.flags} CFLAGS += -Ic_code ?{c.ccompiler.flags}
LDFLAGS += ?{c.linker.flags} LDFLAGS += ?{c.linker.flags}
binDir = ?{firstBinPath(c).toUnix} binDir = ?{firstBinPath(c).toUnix}
@ -35,7 +34,6 @@ endif
ifeq ($(uos),freebsd) ifeq ($(uos),freebsd)
myos= freebsd myos= freebsd
CC = clang CC = clang
LD = clang
LDFLAGS += -lm LDFLAGS += -lm
endif endif
ifeq ($(uos),openbsd) ifeq ($(uos),openbsd)
@ -49,7 +47,6 @@ endif
ifeq ($(uos),darwin) ifeq ($(uos),darwin)
myos = macosx myos = macosx
CC = clang CC = clang
LD = clang
LDFLAGS += -ldl -lm LDFLAGS += -ldl -lm
ifeq ($(HOSTTYPE),x86_64) ifeq ($(HOSTTYPE),x86_64)
ucpu = amd64 ucpu = amd64
@ -181,7 +178,7 @@ endif
$(target): $(oFiles) $(target): $(oFiles)
@mkdir -p $(binDir) @mkdir -p $(binDir)
$(LD) -o $@ $^ $(LDFLAGS) $(CC) -o $@ $^ $(LDFLAGS)
@echo "SUCCESS" @echo "SUCCESS"
.PHONY: clean .PHONY: clean