Merge pull request #10440 from jcarrano/no-export-ports

makefiles: remove exports so that PORT is not evaluated if it's not needed.

Author: fjmolinas

boards/native/Makefile.include

@@ -69,9 +69,9 @@ export LINKFLAGS += -ffunction-sections
 
 # set the tap interface for term/valgrind
 ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
-  export PORT ?= tap0
+  PORT ?= tap0
 else
-  export PORT =
+  PORT =
 endif
 
 TERMFLAGS := $(PORT) $(TERMFLAGS)

dist/tools/usb-serial/README.md

@@ -41,29 +41,14 @@ solution):
     # Add serial matching command
     ifneq ($(PROGRAMMER_SERIAL),)
       OOCD_BOARD_FLAGS += -c 'ftdi_serial $(PROGRAMMER_SERIAL)'
-
-      ifeq ($(PORT),)
-        # try to find tty name by serial number, only works on Linux currently.
-        ifeq ($(OS),Linux)
-          PORT := $(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh "^$(PROGRAMMER_SERIAL)$$"))
-        endif
-      endif
     endif
 
-    # Fallback PORT if no serial was specified or if the specified serial was not found
-    ifeq ($(PORT),)
-        ifeq ($(OS),Linux)
-          PORT := $(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh))
-        else ifeq ($(OS),Darwin)
-          PORT := $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
-        endif
-    endif
+    PORT_LINUX_EXACT = $(if $(PROGRAMMER_SERIAL),$(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh "^$(PROGRAMMER_SERIAL)$$")),)
+
+    PORT_LINUX = $(if $(PORT_LINUX_EXACT),$(PORT_LINUX_EXACT),$(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh)))
+
+    PORT_DARWIN = $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
 
-    # TODO: add support for windows as host platform
-    ifeq ($(PORT),)
-      $(info CAUTION: No terminal port for your host system found!)
-    endif
-    export PORT
 
 
 Limitations

makefiles/tools/serial.inc.mk

@@ -8,7 +8,6 @@ endif
 ifeq ($(PORT),)
   $(info Warning: no PORT set!)
 endif
-export PORT
 
 export BAUD ?= 115200
 

makefiles/vars.inc.mk

@@ -75,7 +75,7 @@ export GIT_CACHE_DIR         # path to git-cache cache directory
 export FLASH_ADDR            # Define an offset to flash code into ROM memory.
 # TERMPROG                   # The command to call on "make term".
 # TERMFLAGS                  # Additional parameters to supply to TERMPROG.
-export PORT                  # The port to connect the TERMPROG to.
+# PORT                       # The port to connect the TERMPROG to.
 export ELFFILE               # The unstripped result of the compilation.
 export HEXFILE               # The 'intel hex' stripped result of the compilation.
 # BINFILE                    # The 'binary' stripped result of the compilation.