HOST_DIR/lib: symlink respectively to lib32/64
authorMatt Weber <matthew.weber@rockwellcollins.com>
Wed, 4 Oct 2017 21:33:19 +0000 (16:33 -0500)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thu, 5 Oct 2017 18:32:14 +0000 (20:32 +0200)
Discovered the issue on a RHEL7.4 machine where
the cmake build dynamically selected HOST_DIR/lib64
as the installation path for the lzo2 library.

Fixes failures like the following:
host-mtd
http://autobuild.buildroot.net/results/d31/d31581d2e60f35cf70312683df99c768e2ea8516/

host-squashfs
http://autobuild.buildroot.net/results/d9c/d9c95231ac774ed71580754a15ebb3b121764310/

Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Makefile

index 9b0958959a2a3c115304be6275ab3827fb4cd8af..02f7cda302aeff3b845447f610dbf162ad299f7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -542,7 +542,7 @@ endif
 
 .PHONY: dirs
 dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-       $(HOST_DIR) $(HOST_DIR)/usr $(BINARIES_DIR)
+       $(HOST_DIR) $(HOST_DIR)/usr $(HOST_DIR)/lib $(BINARIES_DIR)
 
 $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
        $(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
@@ -565,6 +565,13 @@ sdk: world
 $(HOST_DIR)/usr: $(HOST_DIR)
        @ln -snf . $@
 
+$(HOST_DIR)/lib: $(HOST_DIR)
+       @mkdir -p $@
+       @case $(HOSTARCH) in \
+               (*64) ln -snf lib $(@D)/lib64;; \
+               (*)   ln -snf lib $(@D)/lib32;; \
+       esac
+
 # Populating the staging with the base directories is handled by the skeleton package
 $(STAGING_DIR):
        @mkdir -p $(STAGING_DIR)