X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=b92bf2688913d2fbc44346d51dd013495f55ba9d;hb=8b48f4c76a51852d45661e94e2fe9409b639899c;hp=246031492ef94cac1ccb78d5b8cf55066a1b17a8;hpb=f17ab848cb756cad27489bf0c2746e5ead466658;p=hvlinux.git

diff --git a/functions/main b/functions/main
index 2460314..b92bf26 100644
--- a/functions/main
+++ b/functions/main
@@ -94,40 +94,20 @@ DEFAULT_IPKG_SCRIPT="ipkg.def"
 
 HVMAKE="make -j ${MAKEJOBS}"
 
-case "${HVL_TARGET}" in
-    arm*)
-        CLFS_BUILDFLAGS="-mabi=aapcs-linux -mfloat-abi=soft"
-        CLFS_TARGET="arm-linux-gnueabi"
-        CLFS_ARCH=arm
-        CLFS_ENDIAN=LITTLE
-	;;
-    "x86_64")
-	CLFS_BUILDFLAGS="-m64"
-        CLFS_TARGET="${HVL_TARGET}-unknown-linux-gnu"
-        CLFS_ARCH=${HVL_TARGET}
-	;;
-    "x86")
-        # No special flags
-	CLFS_BUILDFLAGS=""
-        CLFS_TARGET="i686-unknown-linux-gnu"
-        CLFS_ARCH=${HVL_TARGET}
-	;;
-    m68k*)
-	#CLFS_BUILDFLAGS="-mcpu=51jm"
-	CLFS_BUILDFLAGS=""
-        CLFS_TARGET="${HVL_TARGET}-unknown-linux-gnu"
-        CLFS_ARCH=${HVL_TARGET}
-	;;
-    *)
-	echo "Unsupported target architecture: ${HVL_TARGET}"
-	return ${EXIT_FAILURE}
-	;;
-esac
+# Load default values. They can be overriden
+# by a target-specific file
+source ../targets/default
+
+if [ -f ../targets/${HVL_TARGET} ]; then
+    source ../targets/${HVL_TARGET}
+fi
+
+CLFS_TARGET="${CLFS_ARCH}-${CLFS_OS}-${CLFS_ABI}"
 
 CLFS_HOST="$(echo $MACHTYPE | \
     sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"
 
-export CLFS_BUILDFLAGS CLFS_TARGET CLFS_ARCH CLFS_HOST CLFS_ENDIAN
+export CLFS_BUILDFLAGS CLFS_TARGET CLFS_ARCH CLFS_HOST
 
 test_presence_of_packages_directory()
 {
@@ -1146,15 +1126,15 @@ get_total_build_time()
 
     for time in ${TIMES}; do
 	HOURS=$(( $HOURS + $(echo ${time} | sed "s!^\([0-9]*\)\..*!\1!g") ))
-	
+
 	# The first SED command extracts the minutes (fractions of an hour).
 	# The second SED command removed the leading zero, if applicable.
 	MIN=$(( $MIN + $(echo ${time} | sed "s!.*\.\([0-9][0-9]\)!\1!g" | sed "s!^0\([0-9]\)!\1!g" ) ))
     done
-    
+
     HOURS=$(( ${HOURS} + ( ${MIN} / 100 ) ))
     MIN=$(( ${MIN} % 100 ))
-    
+
     echo "${HOURS}.${MIN}"
 }