fix: port fix from cs7 to cs6 for building wasm build

fix: port fix from cs7 to cs6 for building wasm build #2536