diff -uNr bcrypt/kgsha/Makefile bcrypt.new/kgsha/Makefile
--- bcrypt/kgsha/Makefile	2006-03-07 05:52:28.000000000 +0000
+++ bcrypt.new/kgsha/Makefile	2006-04-21 23:22:46.000000000 +0000
@@ -20,6 +20,7 @@
 
 CPP=g++
 CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
+CPPFLAGS += $(EXTRA_CXXFLAGS)
 
 TARGET = libkgsha.so
 HEADERS = kg_defs.h kgsha.h kblock.h sha1.h random.h
diff -uNr bcrypt/kgsha256/Makefile bcrypt.new/kgsha256/Makefile
--- bcrypt/kgsha256/Makefile	2006-03-07 05:52:28.000000000 +0000
+++ bcrypt.new/kgsha256/Makefile	2006-04-21 23:22:56.000000000 +0000
@@ -20,6 +20,7 @@
 
 CPP=g++
 CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
+CPPFLAGS += $(EXTRA_CXXFLAGS)
 
 TARGET = libkgsha256.so
 HEADERS = kg_defs.h kblock.h
diff -uNr bcrypt/mod/Makefile bcrypt.new/mod/Makefile
--- bcrypt/mod/Makefile	2006-04-12 05:32:39.000000000 +0000
+++ bcrypt.new/mod/Makefile	2006-04-21 23:22:32.000000000 +0000
@@ -110,15 +110,7 @@
 
 CFLAGS += -I$(CUR_DIR)/../include/ -I$(KERNEL_DIR)/include/
 
-ifeq ($(ARCH), alpha)
-CFLAGS += -O2 -pipe -fno-strict-aliasing -fno-common -mno-fp-regs -ffixed-8 -mcpu=ev5
-else
-ifeq ($(ARCH), x86_64)
-CFLAGS += -O2 -fno-strength-reduce -fno-strict-aliasing -mcmodel=kernel
-else
-CFLAGS += -O6 -fno-strength-reduce -fno-strict-aliasing 
-endif
-endif
+CFLAGS += $(EXTRA_CFLAGS)
 
 LDFLAGS = -d -r
 
diff -uNr bcrypt/src/Makefile bcrypt.new/src/Makefile
--- bcrypt/src/Makefile	2005-05-14 06:53:06.000000000 +0000
+++ bcrypt.new/src/Makefile	2006-04-21 23:23:25.000000000 +0000
@@ -24,6 +24,7 @@
 CFLAGS += -L../lib -I../include/ 
 CFLAGS += -Wall -fno-strict-aliasing -g # -O2
 #CFLAGS += -g -static -O6
+CFLAGS += $(EXTRA_CFLAGS)
 LDFLAGS = -ldl -lstdc++
 
 TARGET = bctool