mara/redox
Watch
0
0
Fork
You've already forked redox
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport prefix changes from aarch64

Browse source
This commit is contained in:
Jeremy Soller 2018-11-27 19:45:52 -07:00
commit 9cece170b1
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 74 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

76
mk/prefix.mk
View file

@ -1,25 +1,22 @@
PREFIX=$(ROOT)/prefix
PREFIX=$(ROOT)/prefix/$(TARGET)
PREFIX_BINUTILS_PATH=$(PREFIX)/binutils-install/bin
PREFIX_FREESTANDING_PATH=$(PREFIX_BINUTILS_PATH):$(PREFIX)/gcc-freestanding-install/bin
PREFIX_PATH=$(PREFIX_BINUTILS_PATH):$(PREFIX)/gcc-install/bin
PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install
PREFIX_INSTALL=$(PREFIX)/gcc-install
PREFIX_FREESTANDING_TARGETS=\
$(PREFIX)/binutils-install \
$(PREFIX)/gcc-freestanding-install
ifeq ($(PREFIX_RUSTC),1)
PREFIX_FREESTANDING_INSTALL=$(PREFIX)/rust-freestanding-install
export RUSTUP_TOOLCHAIN=$(PREFIX)/rust-freestanding-install
endif
PREFIX_TARGETS=\
$(PREFIX)/binutils-install \
$(PREFIX)/gcc-install
PREFIX_PATH=$(PREFIX_INSTALL)/bin
prefix-freestanding: $(PREFIX_FREESTANDING_TARGETS)
prefix-freestanding: $(PREFIX_FREESTANDING_INSTALL)
prefix: $(PREFIX_TARGETS)
touch "$@"
prefix: $(PREFIX_INSTALL)
$(PREFIX)/binutils.tar.bz2:
mkdir -p "$(@D)"
wget -O $@.partial "https://gitlab.redox-os.org/redox-os/binutils-gdb/-/archive/master/binutils-gdb-master.tar.bz2"
wget -O $@.partial "https://gitlab.redox-os.org/redox-os/binutils-gdb/-/archive/redox/binutils-gdb-redox.tar.bz2"
mv $@.partial $@
$(PREFIX)/binutils: $(PREFIX)/binutils.tar.bz2
@ -32,7 +29,7 @@ $(PREFIX)/binutils-install: $(PREFIX)/binutils
rm -rf "$<-build" "$@"
mkdir -p "$<-build" "$@"
cd "$<-build" && \
"$</configure" --target="$(TARGET)" --disable-werror --prefix="$@" && \
"$</configure" --target="$(TARGET)" --program-prefix="$(TARGET)-" --prefix="$@" --disable-werror && \
make all -j `nproc` && \
make install -j `nproc`
touch "$@"
@ -49,36 +46,61 @@ $(PREFIX)/gcc: $(PREFIX)/gcc.tar.bz2
mv "$@.partial" "$@"
touch "$@"
$(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc
$(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install
rm -rf "$<-freestanding-build" "$@"
mkdir -p "$<-freestanding-build" "$@"
mkdir -p "$<-freestanding-build"
cp -r "$(PREFIX)/binutils-install" "$@"
cd "$<-freestanding-build" && \
export PATH="$(PREFIX_BINUTILS_PATH):$$PATH" && \
"$</configure" --target="$(TARGET)" --prefix="$@" --disable-nls --enable-languages=c,c++ --without-headers && \
export PATH="$@/bin:$$PATH" && \
"$</configure" --target="$(TARGET)" --program-prefix="$(TARGET)-" --prefix="$@" --disable-nls --enable-languages=c,c++ --without-headers && \
make all-gcc -j `nproc` && \
make all-target-libgcc -j `nproc` && \
make install-gcc -j `nproc` && \
make install-target-libgcc -j `nproc`
touch "$@"
$(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_TARGETS)
$(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/gcc-freestanding-install
rm -rf "$(PREFIX)/rust-freestanding-build" "$@"
mkdir -p "$(PREFIX)/rust-freestanding-build"
cp -r "$(PREFIX)/gcc-freestanding-install" "$@"
cd "$(PREFIX)/rust-freestanding-build" && \
export PATH="$@/bin:$$PATH" && \
"$</configure" --prefix="$@" --disable-docs && \
make -j `nproc` && \
make install -j `nproc`
touch "$@"
$(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_INSTALL)
rm -rf "$@"
mkdir -p "$@"
cd "$<" && \
export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \
export PATH="$@/bin:$$PATH" && \
make CARGO=xargo all && \
make CARGO=xargo DESTDIR="$@/usr" install
touch "$@"
$(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-install
rm -rf "$<-build" "$@"
mkdir -p "$<-build" "$@"
mkdir -p "$<-build"
cp -r "$(PREFIX_FREESTANDING_INSTALL)" "$@"
cd "$<-build" && \
export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \
"$</configure" --target="$(TARGET)" --disable-werror --prefix="$@" --with-sysroot="$(PREFIX)/relibc-install" --disable-nls --enable-languages=c,c++ && \
export PATH="$@/bin:$$PATH" && \
"$</configure" --target="$(TARGET)" --program-prefix="$(TARGET)-" --prefix="$@" --with-sysroot="$(PREFIX)/relibc-install" --disable-nls --disable-werror --enable-languages=c,c++ && \
make all-gcc -j `nproc` && \
make all-target-libgcc -j `nproc` && \
make install-gcc -j `nproc` && \
make install-target-libgcc -j `nproc` && \
make all-target-libstdc++-v3 -j `nproc` && \
make install-target-libstdc++-v3 -j `nproc`
make install-target-libgcc -j `nproc` # && \
#make all-target-libstdc++-v3 -j `nproc` && \
#make install-target-libstdc++-v3 -j `nproc`
touch "$@"
# Building full rustc may not be required
# $(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/gcc-install
# rm -rf "$(PREFIX)/rust-build" "$@"
# mkdir -p "$(PREFIX)/rust-build" "$@"
# cd "$(PREFIX)/rust-build" && \
# export PATH="$(PREFIX_PATH):$$PATH" && \
# "$</configure" --target="$(TARGET)" --prefix="$@" --disable-docs && \
# make -j `nproc` && \
# make install -j `nproc`
# touch "$@"