Fixed linker flags not setup correctly
Merge branch 'improve_mac_build' into devel-master

* improve_mac_build:
  Fixed linker flags not setup correctly