Attempt to keep target's include directory structure

Author: Bogdan Marinescu

workspace_tools/build_api.py

@@ -160,7 +160,7 @@ def build_mbed_libs(target, toolchain_name, options=None, verbose=False, clean=F
     cmsis_src = join(MBED_TARGETS_PATH, "cmsis")
     resources = toolchain.scan_resources(cmsis_src)
 
-    toolchain.copy_files(resources.headers, BUILD_TARGET)
+    toolchain.copy_files(resources.headers, BUILD_TARGET, cmsis_src)
     toolchain.copy_files(resources.linker_script, BUILD_TOOLCHAIN)
 
     objects = toolchain.compile_sources(resources, TMP_PATH)
@@ -176,12 +176,13 @@ def build_mbed_libs(target, toolchain_name, options=None, verbose=False, clean=F
     # Target specific sources
     HAL_SRC = join(MBED_TARGETS_PATH, "hal")
     hal_implementation = toolchain.scan_resources(HAL_SRC)
-    toolchain.copy_files(hal_implementation.headers, BUILD_TARGET)
-    objects  = toolchain.compile_sources(hal_implementation, TMP_PATH, [MBED_LIBRARIES, BUILD_TARGET])
+    toolchain.copy_files(hal_implementation.headers, BUILD_TARGET, HAL_SRC)
+    incdirs = toolchain.scan_resources(BUILD_TARGET).inc_dirs
+    objects = toolchain.compile_sources(hal_implementation, TMP_PATH, [MBED_LIBRARIES] + incdirs)
 
     # Common Sources
     mbed_resources = toolchain.scan_resources(MBED_COMMON)
-    objects += toolchain.compile_sources(mbed_resources, TMP_PATH, [MBED_LIBRARIES, BUILD_TARGET])
+    objects += toolchain.compile_sources(mbed_resources, TMP_PATH, [MBED_LIBRARIES] + incdirs)
 
     # Keep retargeting as a standalone object to be sure the
     # C standard library symbols get overridden