summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-10-08 21:07:31 +0000
committerMike Frysinger <vapier@gentoo.org>2004-10-08 21:07:31 +0000
commit6e3fcf99ebc67b4d9c392eed6da532051b9c2bb9 (patch)
tree794329f58333e8c17b8d858a35fc850a3ce879d3 /make
parent18ebc33f6cfe04fb8b6de4cbffc1b4e59e60a1d4 (diff)
make sure build uses $TARGET_CFLAGS and the install works
Diffstat (limited to 'make')
-rw-r--r--make/util-linux.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/make/util-linux.mk b/make/util-linux.mk
index a12a7f01f..8343520e9 100644
--- a/make/util-linux.mk
+++ b/make/util-linux.mk
@@ -26,6 +26,7 @@ $(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) $(DL_DIR)/$(UTIL-LIN
$(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked
(cd $(UTIL-LINUX_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--prefix=/usr \
@@ -47,10 +48,15 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked
touch $(UTIL-LINUX_DIR)/.configured
$(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured
- $(MAKE) ARCH=$(ARCH) CC=$(TARGET_CC) -C $(UTIL-LINUX_DIR)
+ $(MAKE) \
+ -C $(UTIL-LINUX_DIR) \
+ ARCH=$(ARCH) \
+ CC=$(TARGET_CC) \
+ OPT="$(TARGET_CFLAGS)" \
+ HAVE_SLANG="NO"
$(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) USE_TTY_GROUP=no -C $(UTIL-LINUX_DIR) install
+ $(MAKE) ARCH=$(ARCH) DESTDIR=$(TARGET_DIR) USE_TTY_GROUP=no -C $(UTIL-LINUX_DIR) install
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc