Commit bf3a2677 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras

Fix target arch and hardcoded PATHs in compilation flags.

parent 0d01ff6e
...@@ -41,7 +41,7 @@ SUBCOMPONENTS ...@@ -41,7 +41,7 @@ SUBCOMPONENTS
Taste::coordinates => "1078 892 2282 1498"; Taste::coordinates => "1078 892 2282 1498";
Deployment::Port_Number => 0; Deployment::Port_Number => 0;
}; };
x86_linux32 : PROCESSOR ocarina_processors_x86::x86.native { x86_linux32 : PROCESSOR ocarina_processors_x86::x86.linux32 {
Taste::coordinates => "927 719 2433 1584"; Taste::coordinates => "927 719 2433 1584";
}; };
PROPERTIES PROPERTIES
......
...@@ -45,10 +45,10 @@ END Function1; ...@@ -45,10 +45,10 @@ END Function1;
SYSTEM IMPLEMENTATION Function1.others SYSTEM IMPLEMENTATION Function1.others
SUBCOMPONENTS SUBCOMPONENTS
flagsToCompileWith : DATA DataView::TASTE_Directive { flagsToCompileWith : DATA DataView::TASTE_Directive {
Taste::FS_Default_Value => "compiler-option:""-I ~/tool-src/testSuites/Demo_ExternalLib/contrib/headers/"""; Taste::FS_Default_Value => "compiler-option:""-I $PRJ_FOLDER/contrib/headers/""";
}; };
flagsToLinkWith : DATA DataView::TASTE_Directive { flagsToLinkWith : DATA DataView::TASTE_Directive {
Taste::FS_Default_Value => "linker-option:""-L ~/tool-src/testSuites/Demo_ExternalLib/contrib/lib/ -lsomelib"""; Taste::FS_Default_Value => "linker-option:""-L $PRJ_FOLDER/contrib/lib/ -lsomelib""";
}; };
PI1_impl : SUBPROGRAM interfaceview::FV::Function1::PI_PI1.others { PI1_impl : SUBPROGRAM interfaceview::FV::Function1::PI_PI1.others {
Compute_Execution_Time => 0 ms .. 0 ms; Compute_Execution_Time => 0 ms .. 0 ms;
......
...@@ -46,6 +46,15 @@ then ...@@ -46,6 +46,15 @@ then
else else
OUTPUTDIR=binary OUTPUTDIR=binary
fi fi
# This is the env var used to specify the link folder base
# inside InterfaceView.aadl:
#
# Taste::FS_Default_Value => "linker-option:""-L $PRJ_FOLDER/contrib/lib/ -lsomelib""";
#
export PRJ_FOLDER=$(pwd)
assert-builder-ocarina.py \ assert-builder-ocarina.py \
--fast \ --fast \
--debug \ --debug \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment