From 9cdc13e0f5d25825ef59808e030bb9929e365488 Mon Sep 17 00:00:00 2001
From: Ali Mashtizadeh <mashti@cs.stanford.edu>
Date: Thu, 9 Oct 2014 21:05:02 -0700
Subject: [PATCH] Improve build portability.

---
 SConstruct           | 1 +
 sys/amd64/kernel.lds | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index 7b1a619..932abfa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -157,6 +157,7 @@ SConscript('sbin/init/SConscript', variant_dir='build/sbin/init')
 env["TOOLCHAINBUILD"] = "TRUE"
 env["CC"] = "cc"
 env["CXX"] = "c++"
+env["LINK"] = "cc"
 SConscript('sbin/newfs_o2fs/SConscript', variant_dir='build/tools/newfs_o2fs')
 
 # Install Targets
diff --git a/sys/amd64/kernel.lds b/sys/amd64/kernel.lds
index 76ee699..717030b 100644
--- a/sys/amd64/kernel.lds
+++ b/sys/amd64/kernel.lds
@@ -1,6 +1,6 @@
-OUTPUT_FORMAT("elf64-x86-64-freebsd",
-	      "elf64-x86-64-freebsd",
-	      "elf64-x86-64-freebsd")
+/*OUTPUT_FORMAT("elf64-x86-64-freebsd",
+          "elf64-x86-64-freebsd",
+          "elf64-x86-64-freebsd")*/
 
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)