diff -r df0e900b8860 Makefile.pre.in
--- a/Makefile.pre.in	Fri Apr 22 23:43:24 2016 -0700
+++ b/Makefile.pre.in	Sat Apr 23 10:49:59 2016 +0200
@@ -161,6 +161,9 @@
 # Option to install to strip binaries
 STRIPFLAG=-s
 
+# compileall options
+COMPILEALL_FLAGS=-f
+
 # Flags to lipo to produce a 32-bit-only universal executable
 LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
 
@@ -1300,31 +1303,31 @@
 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
 	fi
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-		-d $(LIBDEST) -f \
+		$(PYTHON_FOR_BUILD) -Wi -E -B $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST) $(COMPILEALL_FLAGS) \
 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
 		$(DESTDIR)$(LIBDEST)
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
-		-d $(LIBDEST) -f \
+		$(PYTHON_FOR_BUILD) -Wi -E -B -O $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST) $(COMPILEALL_FLAGS) \
 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
 		$(DESTDIR)$(LIBDEST)
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
-		-d $(LIBDEST) -f \
+		$(PYTHON_FOR_BUILD) -Wi -E -B -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST) $(COMPILEALL_FLAGS) \
 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
 		$(DESTDIR)$(LIBDEST)
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-		-d $(LIBDEST)/site-packages -f \
+		$(PYTHON_FOR_BUILD) -Wi -E -B $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST)/site-packages $(COMPILEALL_FLAGS) \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
-		-d $(LIBDEST)/site-packages -f \
+		$(PYTHON_FOR_BUILD) -Wi -E -B -O $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST)/site-packages $(COMPILEALL_FLAGS) \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
-		-d $(LIBDEST)/site-packages -f \
+		$(PYTHON_FOR_BUILD) -Wi -E -B -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST)/site-packages $(COMPILEALL_FLAGS) \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt