Skip to content

Instantly share code, notes, and snippets.

@vu3rdd
Created February 26, 2015 05:50
Show Gist options
  • Save vu3rdd/4fa1a6fd163cd2df5b88 to your computer and use it in GitHub Desktop.
Save vu3rdd/4fa1a6fd163cd2df5b88 to your computer and use it in GitHub Desktop.
Building inferno on OSX
[~/src/inferno/vitanuova/inferno]$ hg diff mkfiles/mkfile-MacOSX-386
diff -r 7ab390b860ca mkfiles/mkfile-MacOSX-386
--- a/mkfiles/mkfile-MacOSX-386 Mon Jun 30 14:13:22 2014 +0100
+++ b/mkfiles/mkfile-MacOSX-386 Thu Feb 26 11:19:09 2015 +0530
@@ -9,12 +9,12 @@
ARFLAGS= ruvs
A= a
-AS= gcc -c -arch i386 -m32
+AS= llvm-gcc -c -arch i386 -m32
ASFLAGS=
ISYSROOT= -isysroot /Developer/SDKs/MacOSX10.6.sdk
-CC= gcc -c -m32
+CC= llvm-gcc -c -m32
COPTFLAGS= -Os
CDEBUGFLAGS=
CTHREADFLAGS=
@@ -23,13 +23,11 @@
-Wno-deprecated-declarations -Wuninitialized -Wunused -Wreturn-type -Wimplicit -Wno-four-char-constants -Wno-unknown-pragmas\
-pipe\
-fno-strict-aliasing\
- -no-cpp-precomp\
- -mno-fused-madd\
-I$ROOT/MacOSX/386/include\
-I$ROOT/include\
$COPTFLAGS $CDEBUGFLAGS\
-LD= gcc -arch i386 -m32
+LD= llvm-gcc -arch i386 -m32
LDFLAGS=\
-mmacosx-version-min=10.4\
-multiply_defined suppress
[~/src/inferno/vitanuova/inferno]$ hg diff mkconfig
diff -r 7ab390b860ca mkconfig
--- a/mkconfig Mon Jun 30 14:13:22 2014 +0100
+++ b/mkconfig Thu Feb 26 11:19:48 2015 +0530
@@ -4,7 +4,7 @@
# They are almost always the same.
# On Nt systems, the ROOT path MUST be of the form `drive:/path'
-ROOT=/usr/inferno
+ROOT=/Users/ramakrishnanm/src/inferno/vitanuova/inferno
#
# Specify the flavour of Tk (std for standard builds)
@@ -14,14 +14,14 @@
#
# Except for building kernels, SYSTARG must always be the same as SYSHOST
#
-SYSHOST=Plan9 # build system OS type (Hp, Inferno, Irix, Linux, MacOSX, Nt, Plan9, Solaris)
+SYSHOST=MacOSX # build system OS type (Hp, Inferno, Irix, Linux, MacOSX, Nt, Plan9, Solaris)
SYSTARG=$SYSHOST # target system OS type (Hp, Inferno, Irix, Linux, Nt, Plan9, Solaris)
#
# specify the architecture of the target system - Plan 9 imports it from the
# environment; for other systems it is usually just hard-coded
#
-#OBJTYPE=386 # target system object type (eg, 386, arm, mips, power, s800, sparc)
+objtype=386 # target system object type (eg, 386, arm, mips, power, s800, sparc)
OBJTYPE=$objtype
#
[~/src/inferno/vitanuova/inferno]$ hg diff MacOSX/386/include/fpuctl.h
diff -r 7ab390b860ca MacOSX/386/include/fpuctl.h
--- a/MacOSX/386/include/fpuctl.h Mon Jun 30 14:13:22 2014 +0100
+++ b/MacOSX/386/include/fpuctl.h Thu Feb 26 11:19:51 2015 +0530
@@ -11,7 +11,7 @@
"fwait\n\t"
"fldcw (%%esp)\n\t"
"popw %%ax\n\t"
- : /* no output */
+ : "=a" (fcr)
: "al" (fcr)
);
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment