sim: move many common settings from CPPFLAGS to config.h

[deliverable/binutils-gdb.git] / sim / common / sim-config.c

diff --git a/sim/common/sim-config.c b/sim/common/sim-config.c
index 7e66787dced5d2635bcb3a245de4ceaff4eeb611..9da710573d93881741fc804dd5e8568600e8dee6 100644 (file)
--- a/sim/common/sim-config.c
+++ b/sim/common/sim-config.c
@@ -237,7 +237,8 @@ sim_config (SIM_DESC sd)
     }
 #endif
   if (STATE_ENVIRONMENT (sd) == ALL_ENVIRONMENT)
-    STATE_ENVIRONMENT (sd) = DEFAULT_ENVIRONMENT;
+    STATE_ENVIRONMENT (sd) = (WITH_ENVIRONMENT != ALL_ENVIRONMENT ?
+                             WITH_ENVIRONMENT : USER_ENVIRONMENT);
 
 
   /* set the alignment */