--- a/ByteCodeCompiler.st	Mon Oct 23 17:58:15 1995 +0100
+++ b/ByteCodeCompiler.st	Tue Oct 24 16:55:13 1995 +0100
@@ -27,7 +27,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	     All Rights Reserved
 
-$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.42 1995-10-23 16:57:48 cg Exp $
+$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.43 1995-10-24 15:54:48 cg Exp $
 '!
 
 !ByteCodeCompiler class methodsFor:'documentation'!
@@ -48,7 +48,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.42 1995-10-23 16:57:48 cg Exp $
+$Header: /cvs/stx/stx/libcomp/ByteCodeCompiler.st,v 1.43 1995-10-24 15:54:48 cg Exp $
 "
 !
 
@@ -304,8 +304,9 @@
     "
      freak-out support ...
     "
-    (compiler hasPrimitiveCode 
-    or:[STCCompilation == #always and:[sel  ~~ #doIt]]) ifTrue:[
+    (compiler hasNonOptionalPrimitiveCode 
+    or:[(compiler hasPrimitiveCode and:[self canCreateMachineCode])
+    or:[STCCompilation == #always and:[sel  ~~ #doIt]]]) ifTrue:[
 	newMethod := compiler 
 			compileToMachineCode:aString 
 			forClass:aClass 
@@ -558,13 +559,7 @@
     ((f := '../../stc' asFilename construct:command)) isExecutable ifTrue:[
 	^ f pathName
     ].
-    ((OperatingSystem getEnvironment:'PATH')
-    asCollectionOfSubstringsSeparatedBy:$:) do:[:path |
-	(f := (path asFilename construct:command)) isExecutable ifTrue:[
-	    ^  f pathName
-	].
-    ].
-    ^ nil
+    ^ OperatingSystem pathOfCommand:command
 
     "
      Compiler stcPathOf:'stc'