Fixed library search path. Added --gcc as required by the DRV library.

diff --git a/rpp/rpp/target_tools.mk b/rpp/rpp/target_tools.mk
index 6b7e33afdd555549a135f09aff0f4a124457a956..bb82bbff7b4b6cf578e85b2050f630b1d8f88fc4 100644 (file)
--- a/rpp/rpp/target_tools.mk
+++ b/rpp/rpp/target_tools.mk
@@ -34,12 +34,11 @@ TARGET_SRCS      =
 # Compiler command and options
 CC      = "$(COMPILER_ROOT)/bin/armcl"
 CFLAGS  = -mv7R4 --code_state=32 --float_support=VFPv3D16 \
-          --abi=eabi --compile_only -O2 \
+          --abi=eabi --compile_only -O2 --gcc --diag_wrap=on \
           --diag_warning=225 --display_error_number --enum_type=packed \
           --include_path="$(COMPILER_ROOT)/include" \
           --include_path="$(RPP_LIB_ROOT)/os/include" \
-          --include_path="$(RPP_LIB_ROOT)/tmp"
-          # FIXME: Remove tmp library when library is ordered
+          --include_path="$(RPP_LIB_ROOT)/drv/include"
 
 CFLAGS          += $(OPTS)
 CDEBUG           = -g
@@ -53,7 +52,7 @@ CXXDEBUG         =
 LD      = $(CC)
 LDFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi \
           -O2 --diag_warning=225 --display_error_number --enum_type=packed \
-          --run_linker -m"$(MODEL).map" --be32 \
+          --run_linker -m"$(MODEL).map" --be32 --diag_wrap=on \
           --stack_size=$(RPP_STACK_SIZE) --heap_size=$(RPP_HEAP_SIZE) \
           --reread_libs --warn_sections --display_error_number --rom_model \
           -i"$(COMPILER_ROOT)/lib" -i"$(COMPILER_ROOT)/include" \