Don't include hidden files in make source file lists (#568)

This commit is contained in:
Albert Magyar 2020-05-21 00:03:32 -07:00 committed by GitHub
parent 4c4d0d62d7
commit e56aad4bed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View File

@ -44,7 +44,7 @@ FIRRTL_SUBMODULE_DIR ?= $(chipyard_dir)/tools/firrtl
FIRRTL_JAR ?= $(chipyard_dir)/lib/firrtl.jar FIRRTL_JAR ?= $(chipyard_dir)/lib/firrtl.jar
FIRRTL_TEST_JAR ?= $(chipyard_dir)/test_lib/firrtl.jar FIRRTL_TEST_JAR ?= $(chipyard_dir)/test_lib/firrtl.jar
firrtl_srcs := $(shell find $(FIRRTL_SUBMODULE_DIR) -iname "*.scala") firrtl_srcs := $(shell find $(FIRRTL_SUBMODULE_DIR) -iname "[!.]*.scala")
$(FIRRTL_JAR): $(firrtl_srcs) $(FIRRTL_JAR): $(firrtl_srcs)
$(MAKE) -C $(FIRRTL_SUBMODULE_DIR) SBT="$(SBT)" root_dir=$(FIRRTL_SUBMODULE_DIR) build-scala $(MAKE) -C $(FIRRTL_SUBMODULE_DIR) SBT="$(SBT)" root_dir=$(FIRRTL_SUBMODULE_DIR) build-scala

View File

@ -44,7 +44,7 @@ submodules = \
$(addprefix tools/, firrtl chisel3)) $(addprefix tools/, firrtl chisel3))
chisel_srcs = $(foreach submodule,$(submodules),\ chisel_srcs = $(foreach submodule,$(submodules),\
$(shell find -L $(submodule)/ -name target -prune -o -iname "*.scala" -print 2> /dev/null)) $(shell find -L $(submodule)/ -name target -prune -o -iname "[!.]*.scala" -print 2> /dev/null))
$(FIRRTL_FILE) $(ANNO_FILE): $(chisel_srcs) $(FIRRTL_JAR) $(FIRRTL_FILE) $(ANNO_FILE): $(chisel_srcs) $(FIRRTL_JAR)
mkdir -p $(@D) mkdir -p $(@D)

View File

@ -32,7 +32,7 @@ HEADER := $(GENERATED_DIR)/$(DESIGN)-const.h
ifdef FIRESIM_STANDALONE ifdef FIRESIM_STANDALONE
firesim_sbt_project := {file:${chipyard_dir}}firechip firesim_sbt_project := {file:${chipyard_dir}}firechip
lookup_scala_srcs = $(shell find -L $(1)/ -name target -prune -o -iname "*.scala" -print 2> /dev/null) lookup_scala_srcs = $(shell find -L $(1)/ -name target -prune -o -iname "[!.]*.scala" -print 2> /dev/null)
SOURCE_DIRS = $(chipyard_dir)/generators $(firesim_base_dir) SOURCE_DIRS = $(chipyard_dir)/generators $(firesim_base_dir)
SCALA_SOURCES = $(call lookup_scala_srcs,$(SOURCE_DIRS)) SCALA_SOURCES = $(call lookup_scala_srcs,$(SOURCE_DIRS))
else else

View File

@ -38,7 +38,7 @@ submodules = \
chisel_srcs = $(foreach submodule,$(submodules),\ chisel_srcs = $(foreach submodule,$(submodules),\
$(shell find -L $(submodule)/ -name target -prune -o -iname "*.scala" -print 2> /dev/null)) $(shell find -L $(submodule)/ -name target -prune -o -iname "[!.]*.scala" -print 2> /dev/null))
CONF_NAME ?= runtime.conf CONF_NAME ?= runtime.conf