diff options
| author | wangpc <wangpengcheng.pp@bytedance.com> | 2024-02-29 13:54:22 +0800 |
|---|---|---|
| committer | Christoph Müllner <christophm30@gmail.com> | 2024-02-29 14:04:37 +0100 |
| commit | 9a28c809a5d355874def06a414aa5f272fae564d (patch) | |
| tree | 5efa5d1ab1363b45d78dc357bea09872b8e6b834 | |
| parent | 94dddaf5e55fe85054b54988ad503e4d2f5a8966 (diff) | |
| download | riscv-gnu-toolchain-2024.03.01.zip riscv-gnu-toolchain-2024.03.01.tar.gz riscv-gnu-toolchain-2024.03.01.tar.bz2 | |
Remove --enable-gold and simplify include search2024.03.01
| -rw-r--r-- | Makefile.in | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 46b78bd..f877704 100644 --- a/Makefile.in +++ b/Makefile.in @@ -357,7 +357,6 @@ stamps/build-binutils-linux: $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) $(PREPARATIO $(CONFIGURE_HOST) \ --prefix=$(INSTALL_DIR) \ --with-sysroot=$(SYSROOT) \ - --enable-gold \ --enable-plugins \ $(MULTILIB_FLAGS) \ @with_guile@ \ @@ -528,7 +527,6 @@ stamps/build-binutils-linux-native: $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) stamp --target=$(LINUX_TUPLE) \ $(CONFIGURE_HOST) \ --prefix=$(INSTALL_DIR)/native \ - --enable-gold \ --enable-plugins \ $(MULTILIB_FLAGS) \ @with_guile@ \ @@ -587,7 +585,6 @@ stamps/build-binutils-newlib: $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) $(PREPARATI --target=$(NEWLIB_TUPLE) \ $(CONFIGURE_HOST) \ --prefix=$(INSTALL_DIR) \ - --enable-gold \ --enable-plugins \ @with_guile@ \ --disable-werror \ @@ -776,7 +773,6 @@ stamps/build-binutils-musl: $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) $(PREPARATION $(CONFIGURE_HOST) \ --prefix=$(INSTALL_DIR) \ --with-sysroot=$(SYSROOT) \ - --enable-gold \ --enable-plugins \ $(MULTILIB_FLAGS) \ @with_guile@ \ @@ -947,7 +943,7 @@ stamps/build-qemu: $(QEMU_SRCDIR) $(QEMU_SRC_GIT) $(PREPARATION_STAMP) mkdir -p $(dir $@) date > $@ -stamps/build-llvm-linux: $(LLVM_SRCDIR) $(LLVM_SRC_GIT) \ +stamps/build-llvm-linux: $(LLVM_SRCDIR) $(LLVM_SRC_GIT) $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) \ stamps/build-gcc-linux-stage2 # We have the following situation: # - sysroot directory: $(INSTALL_DIR)/sysroot @@ -974,7 +970,7 @@ stamps/build-llvm-linux: $(LLVM_SRCDIR) $(LLVM_SRC_GIT) \ -DDEFAULT_SYSROOT="../sysroot" \ -DLLVM_RUNTIME_TARGETS=$(call make_tuple,$(XLEN),linux-gnu) \ -DLLVM_INSTALL_TOOLCHAIN_ONLY=On \ - -DLLVM_BINUTILS_INCDIR=`find $(INSTALL_DIR) -name plugin-api.h | xargs dirname` \ + -DLLVM_BINUTILS_INCDIR=$(BINUTILS_SRCDIR)/include \ -DLLVM_PARALLEL_LINK_JOBS=4 $(MAKE) -C $(notdir $@) $(MAKE) -C $(notdir $@) install @@ -983,7 +979,8 @@ stamps/build-llvm-linux: $(LLVM_SRCDIR) $(LLVM_SRC_GIT) \ cd $(INSTALL_DIR)/bin && ln -s -f clang $(LINUX_TUPLE)-clang && ln -s -f clang++ $(LINUX_TUPLE)-clang++ mkdir -p $(dir $@) && touch $@ -stamps/build-llvm-newlib: $(LLVM_SRCDIR) $(LLVM_SRC_GIT) stamps/build-gcc-newlib-stage2 +stamps/build-llvm-newlib: $(LLVM_SRCDIR) $(LLVM_SRC_GIT) $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) \ + stamps/build-gcc-newlib-stage2 rm -rf $@ $(notdir $@) mkdir $(notdir $@) cd $(notdir $@) && \ @@ -994,7 +991,7 @@ stamps/build-llvm-newlib: $(LLVM_SRCDIR) $(LLVM_SRC_GIT) stamps/build-gcc-newlib -DLLVM_ENABLE_PROJECTS="clang;lld" \ -DLLVM_DEFAULT_TARGET_TRIPLE="$(NEWLIB_TUPLE)" \ -DLLVM_INSTALL_TOOLCHAIN_ONLY=On \ - -DLLVM_BINUTILS_INCDIR=`find $(INSTALL_DIR) -name plugin-api.h | xargs dirname` \ + -DLLVM_BINUTILS_INCDIR=$(BINUTILS_SRCDIR)/include \ -DLLVM_PARALLEL_LINK_JOBS=4 $(MAKE) -C $(notdir $@) $(MAKE) -C $(notdir $@) install |