--- a/host.rc	Tue Jul 01 21:59:39 2014 +0200
+++ b/host.rc	Thu Aug 14 23:50:42 2014 +0200
@@ -56,17 +56,18 @@
     Compiler ccCompilationOptions:'-O'.
 
     (conf includesString:'amd64_mode32') ifTrue:[
-	(ObjectFileLoader linkArgs includesString:'-m32') ifFalse:[
-	    ObjectFileLoader linkArgs:(ObjectFileLoader linkArgs , ' -m32 -m elf_i386').
+	((ObjectFileLoader linkArgs ? '') includesString:'-m32') ifFalse:[
+	    ObjectFileLoader linkArgs:((ObjectFileLoader linkArgs ? '') , ' -m32 -m elf_i386').
 	].
 	(Compiler ccCompilationOptions includesString:'-m32') ifFalse:[
 	    Compiler ccCompilationOptions:(Compiler ccCompilationOptions , ' -m32').
 	].
-	(Compiler stcCompilationDefines includesString:'-D__amd64_mode32__') ifFalse:[
-	    Compiler stcCompilationDefines:(Compiler stcCompilationDefines , ' -D__amd64_mode32__').
+	((Compiler stcCompilationDefines ? '') includesString:'-D__amd64_mode32__') ifFalse:[
+	    Compiler stcCompilationDefines:((Compiler stcCompilationDefines ? ''), ' -D__amd64_mode32__').
 	].
     ].
 
+
     includes := ''.
     incDir := Smalltalk getSystemFileName:'include/stc.h'.
     incDir notNil ifTrue:[ incDir := incDir asFilename directoryName ].