Skip to content

Commit

Permalink
makefiles/toolchain: don't export all variables
Browse files Browse the repository at this point in the history
There are already exported globally in vars.inc.mk
  • Loading branch information
aabadie committed Jun 24, 2020
1 parent cdacdd7 commit 080d5ca
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 39 deletions.
8 changes: 4 additions & 4 deletions makefiles/toolchain/afl.inc.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include $(RIOTMAKE)/toolchain/gnu.inc.mk

export CC = $(PREFIX)afl-gcc
export CXX = $(PREFIX)afl-g++
export LINK = $(PREFIX)afl-gcc
export LINKXX = $(PREFIX)afl-g++
CC = $(PREFIX)afl-gcc
CXX = $(PREFIX)afl-g++
LINK = $(PREFIX)afl-gcc
LINKXX = $(PREFIX)afl-g++
32 changes: 16 additions & 16 deletions makefiles/toolchain/gnu.inc.mk
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
export CC = $(PREFIX)gcc
export CXX = $(PREFIX)g++
export CCAS ?= $(CC)
CC = $(PREFIX)gcc
CXX = $(PREFIX)g++
CCAS ?= $(CC)
ifeq ($(LTO),1)
export AR = $(PREFIX)gcc-ar
export RANLIB = $(PREFIX)gcc-ranlib
AR = $(PREFIX)gcc-ar
RANLIB = $(PREFIX)gcc-ranlib
else
export AR = $(PREFIX)ar
export RANLIB = $(PREFIX)ranlib
AR = $(PREFIX)ar
RANLIB = $(PREFIX)ranlib
endif
export AS = $(PREFIX)as
export NM = $(PREFIX)nm
export LINK = $(PREFIX)gcc
export LINKXX = $(PREFIX)g++
export SIZE = $(PREFIX)size
AS = $(PREFIX)as
NM = $(PREFIX)nm
LINK = $(PREFIX)gcc
LINKXX = $(PREFIX)g++
SIZE = $(PREFIX)size
_OBJCOPY := $(shell command -v $(PREFIX)objcopy || command -v gobjcopy || command -v objcopy)
export OBJCOPY ?= $(_OBJCOPY)
OBJCOPY ?= $(_OBJCOPY)
ifeq ($(OBJCOPY),)
$(warning objcopy not found. Hex file will not be created.)
export OBJCOPY = true
$(warning objcopy not found. Hex file will not be created.)
OBJCOPY = true
endif
# Default to the native (g)objdump, helps when using toolchain from docker
_OBJDUMP := $(or $(shell command -v $(PREFIX)objdump || command -v gobjdump),objdump)
export OBJDUMP ?= $(_OBJDUMP)
OBJDUMP ?= $(_OBJDUMP)
# We use GDB for debugging
include $(RIOTMAKE)/tools/gdb.inc.mk
38 changes: 19 additions & 19 deletions makefiles/toolchain/llvm.inc.mk
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
export LLVMPREFIX ?= llvm-
LLVMPREFIX ?= llvm-
# Apple XCode doesn't prefix its tools with llvm-, but manually installed LLVM
# on OSX might have the llvm- prefix, we can't simply test against uname -s.
# Test if llvm-ar exists
ifeq (,$(shell command -v $(LLVMPREFIX)ar 2>/dev/null))
# fall back to system tools
export LLVMPREFIX :=
# fall back to system tools
LLVMPREFIX :=
endif
export CC = clang
export CXX = clang++
export CCAS ?= $(CC)
export AS = $(LLVMPREFIX)as
export AR = $(LLVMPREFIX)ar
export NM = $(LLVMPREFIX)nm
CC = clang
CXX = clang++
CCAS ?= $(CC)
AS = $(LLVMPREFIX)as
AR = $(LLVMPREFIX)ar
NM = $(LLVMPREFIX)nm
# LLVM does have a linker, however, it is not entirely
# compatible with GCC. For instance spec files as used in
# `makefiles/libc/newlib.mk` are not supported. Therefore
# we just use GCC for now.
export LINK = $(PREFIX)gcc
export LINKXX = $(PREFIX)g++
LINK = $(PREFIX)gcc
LINKXX = $(PREFIX)g++
# objcopy does not have a clear substitute in LLVM, use GNU binutils
#export OBJCOPY = $(LLVMPREFIX)objcopy
_OBJCOPY := $(shell command -v $(PREFIX)objcopy || command -v gobjcopy || command -v objcopy)
export OBJCOPY ?= $(_OBJCOPY)
# OBJCOPY = $(LLVMPREFIX)objcopy
_OBJCOPY := $(shell command -v $(PREFIX)objcopy || command -v gobjcopy || command -v objcopy)
OBJCOPY ?= $(_OBJCOPY)
ifeq ($(OBJCOPY),)
$(warning objcopy not found. Hex file will not be created.)
export OBJCOPY = true
$(warning objcopy not found. Hex file will not be created.)
OBJCOPY = true
endif
# Default to the native (g)objdump, helps when using toolchain from docker
_OBJDUMP := $(or $(shell command -v $(LLVMPREFIX)objdump || command -v gobjdump),objdump)
export OBJDUMP ?= $(_OBJDUMP)
export SIZE = $(LLVMPREFIX)size
_OBJDUMP := $(or $(shell command -v $(LLVMPREFIX)objdump || command -v gobjdump),objdump)
OBJDUMP ?= $(_OBJDUMP)
SIZE = $(LLVMPREFIX)size
# LLVM lacks a binutils strip tool as well...
#export STRIP = $(LLVMPREFIX)strip
# We use GDB for debugging for now, maybe LLDB will be supported in the future.
Expand Down

0 comments on commit 080d5ca

Please sign in to comment.