mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
gcc: move <tuple>/lib* symlink handling up to gcc-intermediate
The <tuple>/lib* symlinking added by 3c77bab2eeace needs to be moved up to the gcc-intermediate step now the NPTL stuff is merged, otherwise 64bit builds fails (lib64 already created). Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
8d4f9ba707
commit
18abd4aa94
@ -259,6 +259,11 @@ GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-intermediate
|
|||||||
|
|
||||||
$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
|
$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
|
||||||
mkdir -p $(GCC_BUILD_DIR2)
|
mkdir -p $(GCC_BUILD_DIR2)
|
||||||
|
-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
||||||
|
mkdir -p $(STAGING_DIR)/lib
|
||||||
|
ln -snf ../../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
||||||
|
$(if $(BR2_ARCH_IS_64),mkdir -p $(STAGING_DIR)/lib64)
|
||||||
|
$(if $(BR2_ARCH_IS_64),ln -snf ../../lib64 $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64)
|
||||||
(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
|
(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
|
||||||
$(HOST_CONFIGURE_OPTS) \
|
$(HOST_CONFIGURE_OPTS) \
|
||||||
$(GCC_DIR)/configure $(QUIET) \
|
$(GCC_DIR)/configure $(QUIET) \
|
||||||
@ -334,13 +339,6 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
|
|||||||
mkdir -p $(GCC_BUILD_DIR3)
|
mkdir -p $(GCC_BUILD_DIR3)
|
||||||
# Important! Required for limits.h to be fixed.
|
# Important! Required for limits.h to be fixed.
|
||||||
ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
|
ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
|
||||||
-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
||||||
mkdir -p $(STAGING_DIR)/lib
|
|
||||||
ln -snf ../../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
||||||
$(if $(BR2_ARCH_IS_64),mkdir -p $(STAGING_DIR)/lib64)
|
|
||||||
$(if $(BR2_ARCH_IS_64),ln -snf ../../lib64 $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64)
|
|
||||||
#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
||||||
#ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
||||||
(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
|
(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
|
||||||
$(HOST_CONFIGURE_OPTS) \
|
$(HOST_CONFIGURE_OPTS) \
|
||||||
$(GCC_SRC_DIR)/configure $(QUIET) \
|
$(GCC_SRC_DIR)/configure $(QUIET) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user