diff --git a/.cproject b/.cproject index 481c19d..99696c5 100644 --- a/.cproject +++ b/.cproject @@ -16,9 +16,12 @@ - + + @@ -46,6 +49,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53,6 +125,9 @@ + + + @@ -70,4 +145,5 @@ + \ No newline at end of file diff --git a/Modulefile b/Modulefile index 27856e3..6a191ef 100644 --- a/Modulefile +++ b/Modulefile @@ -13,22 +13,9 @@ if { $distro == "CentOS" && ![info exists ::env(PROJECT)] && ![info exists ::env puts stderr "Don't forget to execute 'scl enable devtoolset-7 bash'" } -if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/] != 1} { - puts stderr "Please install java via 'sdk install java 11.0.9.hs-adpt'!" - prereq java/11.0.9 -} else { - prepend-path PATH $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/bin - setenv JAVA_HOME $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt -} - -if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/maven/3.6.3] != 1} { - puts stderr "Please install mvn via 'sdk install maven 3.6.3'!" - prereq maven/3.6.3 -} else { - prepend-path PATH $::env(HOME)/.sdkman/candidates/sbt/1.4.4/bin -} - -module load tools/cmake tools/gcc-riscv64/9.2.0 +module load tools/cmake +#module load tools/gcc-riscv64/9.2.0 +module load tools/gcc-riscv32-unknown-elf/11 setenv PROJECT TGFS-ISS diff --git a/dbt-rise-tgc b/dbt-rise-tgc index d990f1c..f9e8e1d 160000 --- a/dbt-rise-tgc +++ b/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit d990f1cf5dc69460e9f3e04d8eb43a6e83bff641 +Subproject commit f9e8e1d857684784a5e0f3b18da0018a14994798 diff --git a/scc b/scc index bfc9efc..dfb06a9 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit bfc9efca1f704514f90cf6e7f63b3146f3177f28 +Subproject commit dfb06a90801b3a7e55b5d4a03d8f161a26063a1c