Index: trunk/i386/boot2/Makefile
===================================================================
--- trunk/i386/boot2/Makefile	(revision 2095)
+++ trunk/i386/boot2/Makefile	(revision 2096)
@@ -90,18 +90,7 @@
 			$(filter %.o,$^) `find $(OBJROOT)/../boot2_modules/ -name \*.o`  $(LIBS) \
 			-o ${SYMROOT}/$@.sys
 
-	@echo "\t[LD] boot.sys"
-	@$(CC) -Wl,-preload -Wl,-alias,boot2,start \
-			-nostdlib -arch i386  -Wl,-pie \
-			-Wl,-segaddr,__INIT,`echo obase=16\; $$((0x${BOOT2ADDR})) | bc` \
-			-Wl,-segaddr,__TEXT,`echo obase=16\; $$((0x${BOOT2ADDR})) + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` | bc` \
-			-Wl,-segaddr,__DATA,`echo obase=16\; $$((0x${BOOT2ADDR})) + ${DATA_PAD} + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __TEXT\` | bc` \
-			-Wl,-read_only_relocs,suppress \
-			-lcc_kext \
-			$(filter %.o,$^) `find $(OBJROOT)/../boot2_modules/ -name \*.o`  $(LIBS) \
-			-o ${SYMROOT}/$@.sys
 
-
 ifeq (${CONFIG_MODULES}, y)
 
 	@# Generate the Symbols.dylib file
@@ -152,6 +141,17 @@
 	-macosx_version_min 10.6 \
 	-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib
 
+else
+	@echo "\t[LD] boot.sys"
+	@$(CC) -Wl,-preload -Wl,-alias,boot2,start \
+			-nostdlib -arch i386  -Wl,-pie \
+			-Wl,-segaddr,__INIT,`echo obase=16\; $$((0x${BOOT2ADDR})) | bc` \
+			-Wl,-segaddr,__TEXT,`echo obase=16\; $$((0x${BOOT2ADDR})) + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` | bc` \
+			-Wl,-segaddr,__DATA,`echo obase=16\; $$((0x${BOOT2ADDR})) + ${DATA_PAD} + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __TEXT\` | bc` \
+			-Wl,-read_only_relocs,suppress \
+			-lcc_kext \
+			$(filter %.o,$^) `find $(OBJROOT)/../boot2_modules/ -name \*.o`  $(LIBS) \
+			-o ${SYMROOT}/$@.sys
 endif
 
 
Index: trunk/Make.rules
===================================================================
--- trunk/Make.rules	(revision 2095)
+++ trunk/Make.rules	(revision 2096)
@@ -68,11 +68,6 @@
 	@$(CPP) $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -MM -M -o $@.Makedep
 	@$(CPP) $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ 
 
-$(OBJROOT)/boot2.o:
-	@echo "\t[AS] boot2.s"
-	@$(CC) -Wa,-n -c $(INC) -arch i386 boot2.s -MM -M -o $@.Makedep
-	@$(CC) -Wa,-n -c $(INC) -arch i386 boot2.s -o $(OBJROOT)/$(@F) 
-
 $(OBJROOT)/%.o: %.s
 	@echo "\t[AS] $<"
 	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -MM -M -o $@.Makedep