mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-29 08:23:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

toolchain: fix up GNU_TARGET_NAME link and target_utils location

Browse Source 
The GNU_TARGET_NAME symlink and target_utils location were not correctly
adjusted to match the move of the toolchain to $(STAGING_DIR)/usr,
creating dangling symlinks.
This commit is contained in:
Peter Korsgaard 2009-01-30 13:34:42 +00:00
parent 81ddf3d083
commit 92bd25c9eb
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/strace/strace.mk
View File

@ -22,8 +22,8 @@ $(STRACE_HOOK_POST_INSTALL): $(STRACE_TARGET_INSTALL_TARGET)
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/strace
rm -f $(TARGET_DIR)/usr/bin/strace-graph
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
install -c $(TARGET_DIR)/usr/bin/strace \
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/strace
endif
touch $@

4
package/stunnel/stunnel.mk
View File

@ -57,9 +57,9 @@ $(TARGET_DIR)/usr/bin/stunnel: $(STUNNEL_DIR)/src/stunnel
install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel
$(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
install -c $(TARGET_DIR)/usr/bin/stunnel \
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
endif
stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel

8
toolchain/gcc/gcc-uclibc-4.x.mk
View File

@ -319,14 +319,14 @@ endif
ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
fi
if [ ! -e $(STAGING_DIR)/usr/bin/cc ]; then \
ln -snf gcc $(STAGING_DIR)/usr/bin/cc; \
if [ ! -e $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc ]; then \
ln -snf gcc $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc; \
fi
# Set up the symlinks to enable lying about target name.
set -e; \
(cd $(STAGING_DIR); \
(cd $(STAGING_DIR)/usr; \
ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
cd usr/bin; \
cd bin; \
for app in $(REAL_GNU_TARGET_NAME)-*; do \
ln -snf $${app} \
$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \

4
toolchain/gdb/gdb.mk
View File

@ -169,9 +169,9 @@ $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
$(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
install -c $(GDB_SERVER_DIR)/gdbserver \
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
endif
install -c -D $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver

4
toolchain/uClibc/uclibc.mk
View File

@ -548,9 +548,9 @@ $(TARGET_DIR)/usr/bin/ldd: $(cross_compiler)
CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
PREFIX=$(TARGET_DIR) utils install_utils
ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
install -c $(TARGET_DIR)/usr/bin/ldd \
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
endif
touch -c $@