Author: alexander
Date: 2005-10-30 05:40:38 -0700 (Sun, 30 Oct 2005)
New Revision: 1013

Modified:
   trunk/Makefile
   trunk/packages/binutils/Makefile
Log:
Reverted config.site addition: bad idea for now, causes too much deviation.


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile      2005-10-30 03:23:26 UTC (rev 1012)
+++ trunk/Makefile      2005-10-30 12:40:38 UTC (rev 1013)
@@ -54,7 +54,6 @@
 include $(CROSSVARS)
 
 export KVERS ?= 2.6.12.5
-export CONFIG_SITE := $(ROOT)/scripts/config.site
 
 # Environment Variables
 # The following lines need to be all on one line - no newlines.

Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile    2005-10-30 03:23:26 UTC (rev 1012)
+++ trunk/packages/binutils/Makefile    2005-10-30 12:40:38 UTC (rev 1013)
@@ -30,10 +30,9 @@
 
 compile-cross:
        cd ../$(DIR) ; for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; 
done
-       ../$(DIR)/configure --prefix=$(CROSS_WD) \
-        --target=$(LFS_TARGET) \
-        --with-lib-path=$(WD)/lib \
-        --disable-nls --enable-shared $(ENABLE-64-BIT-BFD)
+       ../$(DIR)/configure --prefix=$(CROSS_WD) --host=$(LFS_HOST) \
+       --target=$(LFS_TARGET) --with-lib-path=$(WD)/lib \
+       --disable-nls --enable-shared $(ENABLE-64-BIT-BFD)
        make configure-host
        make headers -C bfd
        make $(PM)
@@ -45,9 +44,10 @@
 
 compile-stage1:
        cd ../$(DIR) ; for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; 
done
-       ../$(DIR)/configure --prefix=$(WD) --with-lib-path=$(WD)/lib \
-        --target=$(LFS_TARGET) \
-        --disable-nls --enable-shared $(ENABLE-64-BIT-BFD)
+       CC="$${CC} $(64FLAGS)" ../$(DIR)/configure --prefix=$(WD) 
--libdir=$(WD)/$(LIB_MAYBE64) \
+        --with-lib-path=$(WD)/lib --build=$(LFS_HOST) --host=$(LFS_TARGET) \
+        --target=$(LFS_TARGET) --disable-nls --enable-shared \
+        $(ENABLE-64-BIT-BFD)
        make configure-host
        make headers -C bfd
        make $(PM)
@@ -117,8 +117,11 @@
 
 compile-stage2:
        cd ../$(DIR) ; for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; 
done
-       ../$(DIR)/configure --enable-shared $(ENABLE-64-BIT-BFD)
 ifndef CROSS
+       ../$(DIR)/configure --prefix=/usr --enable-shared
+else
+       CC="gcc $(64FLAGS)" ../$(DIR)/configure --prefix=/usr \
+        --enable-shared $(ENABLE-64-BIT-BFD) --libdir=/usr/$(LIB_MAYBE64)
        make configure-host
 endif
        make $(PM) tooldir=/usr

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to