Fix build process

Closed Jupiter Hu requested to merge hpciddebugfix2 into master

Fixed build process, will have more test, but merge it first.

Merge request reports