Fix use of EXECUTION_ENVIRONMENT_OVERRIDES.

llvm-svn: 181499
victor-eds · May 9, 2013 · fba5c40 · fba5c40
1 parent 73fce90
commit fba5c40
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Makefile.programs b/Makefile.programs
@@ -112,6 +112,13 @@ endif
 
 ifdef RUNUNDER
 RUNSAFELY := $(RUNSAFELY) -u $(RUNUNDER)
+ifdef EXECUTION_ENVIRONMENT_OVERRIDES
+$(error "cannot use both RUNUNDER and EXECUTION_ENVIRONMENT_OVERRIDES")
+endif
+else
+ifdef EXECUTION_ENVIRONMENT_OVERRIDES
+RUNSAFELY := $(RUNSAFELY) -u 'env $(EXECUTION_ENVIRONMENT_OVERRIDES)'
+endif
 endif
 
 RUNSAFELY := $(RUNSAFELY) -t "$(TIMEIT_TARGET)"
@@ -124,10 +131,6 @@ endif
 RUNSAFELY := $(RUNSAFELY) $(RUNTIMELIMIT)
 RUNSAFELYLOCAL := $(RUNSAFELYLOCAL) $(RUNTIMELIMIT)
 
-ifdef EXECUTION_ENVIRONMENT_OVERRIDES
-RUNSAFELY := $(RUNSAFELY) -u 'env $(EXECUTION_ENVIRONMENT_OVERRIDES)' $(RUNSAFELY)
-endif
-
 ifndef STDIN_FILENAME
 STDIN_FILENAME := /dev/null
 endif