diff options
| author | dec05eba <dec05eba@protonmail.com> | 2018-10-21 07:24:44 +0200 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2020-07-06 07:39:33 +0200 |
| commit | 58fc50700dc0c1cac608979c68fc7e5aaf8874bb (patch) | |
| tree | 2648de9a3cc9f538498cc8c00cf88b755492e628 | |
| parent | 2dbd9ec3efae8a3814e6bece0f7ed45038c30380 (diff) | |
Fix dep file not used because of wrong path
| -rw-r--r-- | backend/ninja/Ninja.cpp | 2 | ||||
| -rw-r--r-- | include/Dependency.hpp | 2 | ||||
| -rwxr-xr-x | scripts/package.py | 2 | ||||
| -rw-r--r-- | src/main.cpp | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp index 0fe222b..624d1dc 100644 --- a/backend/ninja/Ninja.cpp +++ b/backend/ninja/Ninja.cpp @@ -1025,7 +1025,7 @@ namespace backend compileCCommand.push_back(ninja::NinjaArg::createRaw("-fstack-protector")); compileCCommand.insert(compileCCommand.end(), { - ninja::NinjaArg::createRaw("-MMD"), + ninja::NinjaArg::createRaw("-MMD -MF $out.d"), ninja::NinjaArg::createRaw("$globalIncDir") }); diff --git a/include/Dependency.hpp b/include/Dependency.hpp index 0381625..f505503 100644 --- a/include/Dependency.hpp +++ b/include/Dependency.hpp @@ -3,7 +3,7 @@ #include <string> #include <cassert> -#include "Version.hpp"; +#include "Version.hpp" namespace sibs { diff --git a/scripts/package.py b/scripts/package.py index 6e861d9..de2f976 100755 --- a/scripts/package.py +++ b/scripts/package.py @@ -22,7 +22,7 @@ $DOWNLOAD_DEPENDENCIES_COMMAND "$script_dir/$SO_LOADER" --library-path "$script_dir/libs":$HOME/.local/lib/sibs/"$program_full_name":/usr/lib/sibs/"$program_full_name" "$script_dir/$PROGRAM_NAME" "$@" """ -blacklisted_libs = [ re.compile("libGL\\.so.*"), re.compile("libGLX.*"), re.compile("libGLdispatch.*") ] +blacklisted_libs = [ re.compile("libGL\\.so.*"), re.compile("libEGL\\.so.*"), re.compile("libGLX.*"), re.compile("libGLdispatch.*") ] def get_executable_dynamic_libraries(filepath): libs = [] diff --git a/src/main.cpp b/src/main.cpp index 5d43679..8e9cc00 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -98,6 +98,9 @@ using namespace std::chrono; // TODO: Generate compile_commands.json even if compilation fails. This is needed to properly show errors in IDE. +// TODO: If dependencies are using a version that is not within our dependency version range then ask the user if they still want to use the dependency (the closest matching dependency). +// Currently if dependency version does not match, build will always fail with no option to ignore version mismatch. + #if OS_FAMILY == OS_FAMILY_POSIX #define fout std::cout #define ferr std::cerr |