Fix issue with detection if source is from own project

SanderMertens · Apr 20, 2024 · 423829b · 423829b
1 parent 9bbf629
commit 423829b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 20 deletions.
diff --git a/drivers/lang/c/src/gcc/driver.c b/drivers/lang/c/src/gcc/driver.c
@@ -214,6 +214,12 @@ void gcc_add_std(
             ut_strbuf_appendstr(cmd, " -Wno-c++11-narrowing");
         }
     }
+
+    /* If project contains imported source files from other projects, warnings
+     * for unused functions are probably not going to be helpful. */
+    if (!own_src) {
+        ut_strbuf_appendstr(cmd, " -Wno-unused-function");
+    }
 }
 
 static
@@ -374,7 +380,7 @@ void gcc_compile_src(
      * add the precompiled header options for the current project header. */
     bool own_source = true;
     char *relative_src = &source[strlen(project->path)];
-    if (strncmp(relative_src, "deps"UT_OS_PS, 5)) {
+    if (!strncmp(relative_src, "deps"UT_OS_PS, 5)) {
         own_source = false;
     }
 

diff --git a/examples/c/pkg_clib/include/examples-c-pkg_clib/bake_config.h b/examples/c/pkg_clib/include/examples-c-pkg_clib/bake_config.h
@@ -22,11 +22,11 @@
 
 /* Convenience macro for exporting symbols */
 #ifndef examples_c_pkg_clib_STATIC
-#if examples_c_pkg_clib_EXPORTS && (defined(_MSC_VER) || defined(__MINGW32__))
+#if defined(examples_c_pkg_clib_EXPORTS) && (defined(_MSC_VER) || defined(__MINGW32__))
   #define EXAMPLES_C_PKG_CLIB_API __declspec(dllexport)
-#elif examples_c_pkg_clib_EXPORTS
+#elif defined(examples_c_pkg_clib_EXPORTS)
   #define EXAMPLES_C_PKG_CLIB_API __attribute__((__visibility__("default")))
-#elif defined _MSC_VER
+#elif defined(_MSC_VER)
   #define EXAMPLES_C_PKG_CLIB_API __declspec(dllimport)
 #else
   #define EXAMPLES_C_PKG_CLIB_API

diff --git a/examples/c/pkg_dependee/include/examples-c-pkg_dependee/bake_config.h b/examples/c/pkg_dependee/include/examples-c-pkg_dependee/bake_config.h
@@ -23,11 +23,11 @@
 
 /* Convenience macro for exporting symbols */
 #ifndef examples_c_pkg_dependee_STATIC
-#if examples_c_pkg_dependee_EXPORTS && (defined(_MSC_VER) || defined(__MINGW32__))
+#if defined(examples_c_pkg_dependee_EXPORTS) && (defined(_MSC_VER) || defined(__MINGW32__))
   #define EXAMPLES_C_PKG_DEPENDEE_API __declspec(dllexport)
-#elif examples_c_pkg_dependee_EXPORTS
+#elif defined(examples_c_pkg_dependee_EXPORTS)
   #define EXAMPLES_C_PKG_DEPENDEE_API __attribute__((__visibility__("default")))
-#elif defined _MSC_VER
+#elif defined(_MSC_VER)
   #define EXAMPLES_C_PKG_DEPENDEE_API __declspec(dllimport)
 #else
   #define EXAMPLES_C_PKG_DEPENDEE_API

diff --git a/examples/c/pkg_dependency/include/examples-c-pkg_dependency/bake_config.h b/examples/c/pkg_dependency/include/examples-c-pkg_dependency/bake_config.h
@@ -22,11 +22,11 @@
 
 /* Convenience macro for exporting symbols */
 #ifndef examples_c_pkg_dependency_STATIC
-#if examples_c_pkg_dependency_EXPORTS && (defined(_MSC_VER) || defined(__MINGW32__))
+#if defined(examples_c_pkg_dependency_EXPORTS) && (defined(_MSC_VER) || defined(__MINGW32__))
   #define EXAMPLES_C_PKG_DEPENDENCY_API __declspec(dllexport)
-#elif examples_c_pkg_dependency_EXPORTS
+#elif defined(examples_c_pkg_dependency_EXPORTS)
   #define EXAMPLES_C_PKG_DEPENDENCY_API __attribute__((__visibility__("default")))
-#elif defined _MSC_VER
+#elif defined(_MSC_VER)
   #define EXAMPLES_C_PKG_DEPENDENCY_API __declspec(dllimport)
 #else
   #define EXAMPLES_C_PKG_DEPENDENCY_API

diff --git a/examples/c/pkg_dependency_private/include/examples-c-pkg_dependency_private/bake_config.h b/examples/c/pkg_dependency_private/include/examples-c-pkg_dependency_private/bake_config.h
@@ -27,11 +27,11 @@
 
 /* Convenience macro for exporting symbols */
 #ifndef examples_c_pkg_dependency_private_STATIC
-#if examples_c_pkg_dependency_private_EXPORTS && (defined(_MSC_VER) || defined(__MINGW32__))
+#if defined(examples_c_pkg_dependency_private_EXPORTS) && (defined(_MSC_VER) || defined(__MINGW32__))
   #define EXAMPLES_C_PKG_DEPENDENCY_PRIVATE_API __declspec(dllexport)
-#elif examples_c_pkg_dependency_private_EXPORTS
+#elif defined(examples_c_pkg_dependency_private_EXPORTS)
   #define EXAMPLES_C_PKG_DEPENDENCY_PRIVATE_API __attribute__((__visibility__("default")))
-#elif defined _MSC_VER
+#elif defined(_MSC_VER)
   #define EXAMPLES_C_PKG_DEPENDENCY_PRIVATE_API __declspec(dllimport)
 #else
   #define EXAMPLES_C_PKG_DEPENDENCY_PRIVATE_API

diff --git a/examples/c/pkg_dependency_private/include/examples_c_pkg_dependency_private.h b/examples/c/pkg_dependency_private/include/examples_c_pkg_dependency_private.h
@@ -4,5 +4,7 @@
 /* This generated file contains includes for project dependencies */
 #include "examples-c-pkg_dependency/bake_config.h"
 
+void pkg_dependency_private(void);
+
 #endif
 
diff --git a/examples/c/pkg_dependency_private/src/main.c b/examples/c/pkg_dependency_private/src/main.c
@@ -1,7 +1,6 @@
 #include <examples_c_pkg_dependency_private.h>
 #include <stdio.h>
 
-static
 void pkg_dependency_private(void) {
     pkg_helloworld();
     printf("pkg_dependency_private\n");

diff --git a/examples/c/pkg_helloworld/include/examples-c-pkg_helloworld/bake_config.h b/examples/c/pkg_helloworld/include/examples-c-pkg_helloworld/bake_config.h
@@ -22,11 +22,11 @@
 
 /* Convenience macro for exporting symbols */
 #ifndef examples_c_pkg_helloworld_STATIC
-#if examples_c_pkg_helloworld_EXPORTS && (defined(_MSC_VER) || defined(__MINGW32__))
+#if defined(examples_c_pkg_helloworld_EXPORTS) && (defined(_MSC_VER) || defined(__MINGW32__))
   #define EXAMPLES_C_PKG_HELLOWORLD_API __declspec(dllexport)
-#elif examples_c_pkg_helloworld_EXPORTS
+#elif defined(examples_c_pkg_helloworld_EXPORTS)
   #define EXAMPLES_C_PKG_HELLOWORLD_API __attribute__((__visibility__("default")))
-#elif defined _MSC_VER
+#elif defined(_MSC_VER)
   #define EXAMPLES_C_PKG_HELLOWORLD_API __declspec(dllimport)
 #else
   #define EXAMPLES_C_PKG_HELLOWORLD_API

diff --git a/examples/c/pkg_w_dependee/include/examples-c-pkg_w_dependee/bake_config.h b/examples/c/pkg_w_dependee/include/examples-c-pkg_w_dependee/bake_config.h
@@ -22,11 +22,11 @@
 
 /* Convenience macro for exporting symbols */
 #ifndef examples_c_pkg_w_dependee_STATIC
-#if examples_c_pkg_w_dependee_EXPORTS && (defined(_MSC_VER) || defined(__MINGW32__))
+#if defined(examples_c_pkg_w_dependee_EXPORTS) && (defined(_MSC_VER) || defined(__MINGW32__))
   #define EXAMPLES_C_PKG_W_DEPENDEE_API __declspec(dllexport)
-#elif examples_c_pkg_w_dependee_EXPORTS
+#elif defined(examples_c_pkg_w_dependee_EXPORTS)
   #define EXAMPLES_C_PKG_W_DEPENDEE_API __attribute__((__visibility__("default")))
-#elif defined _MSC_VER
+#elif defined(_MSC_VER)
   #define EXAMPLES_C_PKG_W_DEPENDEE_API __declspec(dllimport)
 #else
   #define EXAMPLES_C_PKG_W_DEPENDEE_API