diff --git a/bin/build_kernel.sh b/bin/build_kernel.sh
index b6f33ab888..9412a68ece 100755
--- a/bin/build_kernel.sh
+++ b/bin/build_kernel.sh
@@ -34,12 +34,15 @@ OCL_VER="2.0"
 
 if [ -e $ROCM_DIR/llvm ] ; then
   LLVM_DIR=$ROCM_DIR/llvm
-  LIB_DIR=$ROCM_DIR/lib/bitcode
+  LIB_DIR=$ROCM_DIR/lib
 else
   LLVM_DIR=$ROCM_DIR/hcc
   LIB_DIR=$LLVM_DIR/lib
 fi
 
+BC_DIR=$LIB_DIR/bitcode
+if [ ! -d "$BC_DIR" ] ; then BC_DIR=$LIB_DIR; fi
+
 CLANG_ROOT=$LLVM_DIR/lib/clang
 CLANG_DIR=`ls -d $CLANG_ROOT/* | head -n 1`
 if [ "$CLANG_DIR" = "" ] ; then
@@ -50,9 +53,9 @@ fi
 BIN_DIR=$LLVM_DIR/bin
 INC_DIR=$CLANG_DIR/include
 BITCODE_OPTS="\
-  -Xclang -mlink-bitcode-file -Xclang $LIB_DIR/opencl.amdgcn.bc \
-  -Xclang -mlink-bitcode-file -Xclang $LIB_DIR/ockl.amdgcn.bc \
-  -Xclang -mlink-bitcode-file -Xclang $LIB_DIR/ocml.amdgcn.bc"
+  -Xclang -mlink-bitcode-file -Xclang $BC_DIR/opencl.amdgcn.bc \
+  -Xclang -mlink-bitcode-file -Xclang $BC_DIR/ockl.amdgcn.bc \
+  -Xclang -mlink-bitcode-file -Xclang $BC_DIR/ocml.amdgcn.bc"
 
 for GFXIP in $TGT_LIST ; do
   OBJ_PREF=$GFXIP