Skip to content

Commit

Permalink
Remove some unneeded install steps
Browse files Browse the repository at this point in the history
Newlib doesn't need to be built and installed to another directory (it
won't be used, even if there).

Remove copy of libgcc.a as well, since it's already in the GCC tools
dir.

Leave the stdc/stdc++exc since we manually choose amongst them in the
link stage for C++ exceptions enabled/disabled.
  • Loading branch information
earlephilhower committed Dec 23, 2020
1 parent dba3cc8 commit 48f7b08
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -568,15 +568,15 @@ install: .stage.LINUX.install
rm -rf $(ARDUINO)
git clone https://github.com/$(GHUSER)/Arduino $(ARDUINO)
(cd $(ARDUINO) && git checkout $(INSTALLBRANCH) && git submodule init && git submodule update)
echo "-------- Building installable newlib"
rm -rf arena/newlib-install; mkdir -p arena/newlib-install
cd arena/newlib-install; $(call setenv,$@); $(REPODIR)/newlib/configure $(CONFIGURENEWLIBINSTALL); $(MAKE); $(MAKE) install
#echo "-------- Building installable newlib"
#rm -rf arena/newlib-install; mkdir -p arena/newlib-install
#cd arena/newlib-install; $(call setenv,$@); $(REPODIR)/newlib/configure $(CONFIGURENEWLIBINSTALL); $(MAKE); $(MAKE) install
echo "-------- Building installable hal"
rm -rf arena/hal-install; mkdir -p arena/hal-install
cd arena/hal-install; $(call setenv,$@); $(REPODIR)/lx106-hal/configure --prefix=$(ARDUINO)/tools/sdk/libc --libdir=$(ARDUINO)/tools/sdk/lib --host=xtensa-lx106-elf $$(echo $(call configure,$@) | sed 's/--host=[a-zA-Z0-9_-]*//' | sed 's/--prefix=[a-zA-Z0-9_-\\]*//')
cd arena/hal-install; $(call setenv,$@); $(MAKE) ; $(MAKE) install
echo "-------- Copying GCC libs"
cp $(call install,$@)/lib/gcc/xtensa-lx106-elf/*/libgcc.a $(ARDUINO)/tools/sdk/lib/.
#cp $(call install,$@)/lib/gcc/xtensa-lx106-elf/*/libgcc.a $(ARDUINO)/tools/sdk/lib/.
cp $(call install,$@)/xtensa-lx106-elf/lib/libstdc++-exc.a $(ARDUINO)/tools/sdk/lib/.
cp $(call install,$@)/xtensa-lx106-elf/lib/libstdc++.a $(ARDUINO)/tools/sdk/lib/.
echo "-------- Copying toolchain directory"
Expand Down

0 comments on commit 48f7b08

Please sign in to comment.