Remove some #ifdef (#6228)

Author: cknitt

jscomp/bsc/rescript_compiler_main.ml

@@ -466,6 +466,8 @@ let file_level_flags_handler (e : Parsetree.expression option) =
 
 let _ : unit =   
   Bs_conditional_initial.setup_env ();
+  Clflags.color := Some Always;
+    
   let flags = "flags" in 
   Ast_config.add_structure 
     flags file_level_flags_handler;    

jscomp/core/bs_conditional_initial.ml

@@ -34,10 +34,6 @@ let setup_env () =
   Clflags.dump_location := false;  
   Config.syntax_kind := `rescript;
   Parmatch.print_res_pat := Pattern_printer.print_pattern;
-#ifdef BROWSER
-#else    
-  Clflags.color := Some Always;
-#endif  
   (* default true
      otherwise [bsc -I sc src/hello.ml ] will include current directory to search path
   *)
@@ -53,21 +49,11 @@ let setup_env () =
   Lambda.blk_record := Record_attributes_check.blk_record;
   Matching.names_from_construct_pattern := 
     Matching_polyfill.names_from_construct_pattern;
-#ifndef RELEASE 
-    (let root_dir = 
-       Filename.dirname 
-         (Filename.dirname Sys.executable_name) in 
-     let (//) = Filename.concat in       
-     Clflags.include_dirs :=
-       (root_dir//"jscomp"//"others") ::
-       (root_dir//"jscomp"//"stdlib-406") ::
-       !Clflags.include_dirs);
-#endif
-  Rescript_cpp.replace_directive_bool "BS" true;
+  
+    Rescript_cpp.replace_directive_bool "BS" true;
   Rescript_cpp.replace_directive_bool "JS" true;
   Rescript_cpp.replace_directive_string "BS_VERSION"  Bs_version.version
   (*; Switch.cut := 100*) (* tweakable but not very useful *)
 
-
 let () = 
   at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())