summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNathaniel Graff <nathaniel.graff@sifive.com>2019-03-12 10:09:10 -0700
committerNathaniel Graff <nathaniel.graff@sifive.com>2019-03-12 15:37:07 -0700
commit1b72ca73835d6064b467a126a392f4539fa2f10a (patch)
tree2cadf4a3e7d05df28a8f8cbeb5cf386456f8e0f4 /Makefile
parentebe73c01fbdf73b3b4c6beaf089edb7ee394aa0b (diff)
Build metal libs into install/lib/CONFIGURATION
Removes the INCLUDE_METAL_SOURCES option. If we want to be able to support multiple build configurations for standalone projects, the Metal library must be rebuilt to take into account those options. An alternative is to put back the prebuilt library option and just remove the configuration option from standalone projects without the Metal library sources. Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile27
1 files changed, 1 insertions, 26 deletions
diff --git a/Makefile b/Makefile
index ee3b396..96e8fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -88,8 +88,7 @@ help:
@echo " running program."
@echo ""
@echo " standalone STANDALONE_DEST=/path/to/desired/location"
- @echo " [INCLUDE_METAL_SOURCES=1] [PROGRAM=$(PROGRAM)]"
- @echo " [TARGET=$(TARGET)] [CONFIGURATION=$(CONFIGURATION)]:"
+ @echo " [PROGRAM=$(PROGRAM)] [TARGET=$(TARGET)]:"
@echo " Exports a program for a single target into a standalone"
@echo " project directory at STANDALONE_DEST."
@echo ""
@@ -158,8 +157,6 @@ $(STANDALONE_DEST):
$(STANDALONE_DEST)/%:
mkdir -p $@
-ifneq ($(INCLUDE_METAL_SOURCES),)
-
standalone: \
$(STANDALONE_DEST) \
$(STANDALONE_DEST)/bsp \
@@ -186,28 +183,6 @@ standalone: \
cat scripts/standalone.mk >> $</Makefile
cat scripts/libmetal.mk >> $</Makefile
-else
-standalone: \
- $(STANDALONE_DEST) \
- $(STANDALONE_DEST)/bsp \
- $(STANDALONE_DEST)/src \
- $(BSP_DIR)/install/lib/libmetal.a \
- $(BSP_DIR)/install/lib/libmetal-gloss.a \
- $(SRC_DIR) \
- debug.mk \
- release.mk \
- scripts/standalone.mk
- cp -r $(addprefix $(BSP_DIR)/,$(filter-out build,$(shell ls $(BSP_DIR)))) $</bsp/
-
- $(MAKE) -C $(SRC_DIR) clean
- cp -r $(SRC_DIR)/* $</src/
-
- cp debug.mk $</debug.mk
- cp release.mk $</release.mk
-
- echo "PROGRAM = $(PROGRAM)" > $</Makefile
- cat scripts/standalone.mk >> $</Makefile
-endif
endif
#############################################################