From 90e36f23af030c83290b27e2fe8791f7a77ad335 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 13 Jan 2012 19:29:30 +0100 Subject: [PATCH] Consider CC_MARCH to find lx_hybrid crtn, fix #82 Patch by Christian Prochaska. This patch fixes problems with building the 32-bit variant of 'fb_sdl' on a 64-bit host system. --- base-linux/lib/import/import-lx_hybrid.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base-linux/lib/import/import-lx_hybrid.mk b/base-linux/lib/import/import-lx_hybrid.mk index ac1ff5db88..71a1af5705 100644 --- a/base-linux/lib/import/import-lx_hybrid.mk +++ b/base-linux/lib/import/import-lx_hybrid.mk @@ -7,9 +7,9 @@ include $(call select_from_repositories,lib/import/import-syscall.mk) # Manually supply all library search paths of the host compiler to our tool # chain. # -HOST_LIB_SEARCH_DIRS := $(shell cc -print-search-dirs | grep libraries |\ - sed "s/.*=//" | sed "s/:/ /g" |\ - sed "s/\/ / /g" | sed "s/\/\$$//") +HOST_LIB_SEARCH_DIRS = $(shell cc $(CC_MARCH) -print-search-dirs | grep libraries |\ + sed "s/.*=//" | sed "s/:/ /g" |\ + sed "s/\/ / /g" | sed "s/\/\$$//") # # Add search path for 'limits.h' # @@ -77,11 +77,11 @@ endif # # Use the host's startup codes, linker script, and dynamic linker # -EXT_OBJECTS += $(shell cc -print-file-name=crt1.o) -EXT_OBJECTS += $(shell cc -print-file-name=crti.o) -EXT_OBJECTS += $(shell cc -print-file-name=crtbegin.o) -EXT_OBJECTS += $(shell cc -print-file-name=crtend.o) -EXT_OBJECTS += $(shell cc -print-file-name=crtn.o) +EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crt1.o) +EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crti.o) +EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtbegin.o) +EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtend.o) +EXT_OBJECTS += $(shell cc $(CC_MARCH) -print-file-name=crtn.o) EXT_OBJECTS += -lgcc -lgcc_s -lsupc++ -lc EXT_OBJECTS += -lpthread