Mercurial > vanilla
changeset 765:859f76ffb512
vanilla: revert binutils for now
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Thu, 08 Aug 2019 17:10:50 +0200 |
| parents | fc7a2268d9a6 |
| children | e91fbcb3d1ef |
| files | core/grub/grub.sh dev/binutils/binutils.sh dev/llvm/llvm.sh |
| diffstat | 3 files changed, 4 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/core/grub/grub.sh Thu Aug 08 20:55:00 2019 +0200 +++ b/core/grub/grub.sh Thu Aug 08 17:10:50 2019 +0200 @@ -63,28 +63,16 @@ BUILD_CFLAGS="$CFLAGS" \ BUILD_CXX="$CXX" \ BUILD_CXXFLAGS="$CXXFLAGS" \ - BUILD_NM=/libexec/bin/binutils-nm \ - BUILD_OBJCOPY=/libexec/bin/binutils-objcopy \ - BUILD_RANLIB=/libexec/bin/binutils-ranlib \ - BUILD_STRIP=/libexec/bin/binutils-strip \ CC="$CC" \ CFLAGS="$CFLAGS" \ CXX="$CXX" \ CXXFLAGS="$CXXFLAGS" \ - NM=/libexec/bin/binutils-nm \ - OBJCOPY=/libexec/bin/binutils-objcopy \ - RANLIB=/libexec/bin/binutils-ranlib \ - STRIP=/libexec/bin/binutils-strip \ + LDFLAGS="$LDFLAGS" \ + LIBS="$LIBS" \ TARGET_CC="$CC" \ TARGET_CFLAGS="$CFLAGS" \ TARGET_CXX="$CXX" \ TARGET_CXXFLAGS="$CXXFLAGS" \ - TARGET_NM=/libexec/bin/binutils-nm \ - TARGET_OBJCOPY=/libexec/bin/binutils-objcopy \ - TARGET_RANLIB=/libexec/bin/binutils-ranlib \ - TARGET_STRIP=/libexec/bin/binutils-strip \ - LDFLAGS="$LDFLAGS" \ - LIBS="$LIBS" \ ../configure \ --build=$CBUILD \ --host=$CHOST \
--- a/dev/binutils/binutils.sh Thu Aug 08 20:55:00 2019 +0200 +++ b/dev/binutils/binutils.sh Thu Aug 08 17:10:50 2019 +0200 @@ -64,28 +64,16 @@ --build=$CBUILD \ --host=$CHOST \ --target=$CTARGET \ + --prefix= \ --sbindir=/bin \ - --prefix= \ --disable-werror \ --enable-shared \ - --program-prefix=binutils- \ --with-system-zlib \ $with_nls \ $with_gdb make make install DESTDIR=$DESTDIR - rm -f $DESTDIR/lib/libbfd.la - rm -f $DESTDIR/lib/libopcodes.la - - # --program-prefix-binutils is not enough, remove conflicts with llvm. - rm -f $DESTDIR/bin/ar - rm -f $DESTDIR/bin/as - rm -f $DESTDIR/bin/objcopy - rm -f $DESTDIR/bin/objdump - rm -f $DESTDIR/bin/nm - rm -f $DESTDIR/bin/ranlib - rm -f $DESTDIR/bin/readelf - rm -f $DESTDIR/bin/strip + rm -f $DESTDIR/lib/*.la cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/dev/llvm/llvm.sh Thu Aug 08 20:55:00 2019 +0200 +++ b/dev/llvm/llvm.sh Thu Aug 08 17:10:50 2019 +0200 @@ -120,7 +120,6 @@ -DLLVM_ENABLE_RTTI=On \ -DLLVM_HOST_TRIPLE=$CHOST \ -DLLVM_TARGETS_TO_BUILD=$TARGETS \ - -DLLVM_INSTALL_BINUTILS_SYMLINKS=On \ -DLLVM_BUILD_LLVM_DYLIB=On \ -DLLVM_LINK_LLVM_DYLIB=On \ $with_doxygen \