Include user-supplied conf-file and dont link with kernel

lf-lang · Jan 22, 2024 · de76dd1 · de76dd1
1 parent 805b822
commit de76dd1
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -144,9 +144,9 @@ CodeBuilder generateCMakeCode(
     // Setup the project header for different platforms
     switch (platformOptions.platform()) {
       case ZEPHYR:
-        cMakeCode.pr("# Set default configuration file. To add custom configurations,");
-        cMakeCode.pr("# pass -- -DOVERLAY_CONFIG=my_config.prj to either cmake or west");
+        cMakeCode.pr("# Include default lf conf-file and user supplied conf file.");
         cMakeCode.pr("set(CONF_FILE prj_lf.conf)");
+        cMakeCode.pr("set(OVERLAY_CONFIG prj.conf)");
         if (platformOptions.board() != null) {
           cMakeCode.pr("# Selecting board specified in target property");
           cMakeCode.pr("set(BOARD " + platformOptions.board() + ")");
@@ -470,9 +470,6 @@ private static String setUpMainTargetZephyr(
     var code = new CodeBuilder();
     code.pr("add_subdirectory(core)");
     code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
-    // FIXME: Linking the reactor-c corelib with the zephyr kernel lib
-    //  resolves linker issues but I am not yet sure if it is safe
-    code.pr("target_link_libraries(core PRIVATE kernel)");
     code.newLine();
 
     if (hasMain) {