Browse Source

[P2012] move some rule variables outside of the toolchain file

Ioannis Koutras 12 years ago
parent
commit
6b03d06973
2 changed files with 4 additions and 6 deletions
  1. 4 0
      DefineOptions.cmake
  2. 0 6
      toolchain-stxp70v4.cmake

+ 4 - 0
DefineOptions.cmake

@@ -61,6 +61,10 @@ option(LEON3 "Build for Leon3" OFF)
 option(LINUX "Build for Linux" OFF) 
 
 if(P2012)
+  if(CMAKE_CROSSCOMPILING)
+    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> -mcore=stxp70v4 <LINK_FLAGS> cr <TARGET> <OBJECTS>")
+    set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -mcore=stxp70v4 <TARGET>")
+  endif(CMAKE_CROSSCOMPILING)
   set(DMM_DATA_ALIGNMENT "4") # Do not change
   set(WITH_SYSTEM_CALLS "none") # Do not change
   set(HAVE_LOCKS OFF) # Do not change

+ 0 - 6
toolchain-stxp70v4.cmake

@@ -13,14 +13,8 @@ set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS $ENV{LDFLAGS})
 set (CMAKE_AR stxp70-ar)
 set (CMAKE_RANLIB stxp70-ranlib)
 
-SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> -mcore=stxp70v4 <LINK_FLAGS> cr <TARGET> <OBJECTS>")
-SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -mcore=stxp70v4 <TARGET>")
-
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 # for libraries and headers in the target directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
-
-set(CMAKE_BUILD_TYPE Release)
-