Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scons: remove redundant -DSWAGLOG Flag #33070

Merged
merged 1 commit into from
Jul 25, 2024

Conversation

deanlee
Copy link
Contributor

@deanlee deanlee commented Jul 25, 2024

This PR prevents the -DSWAGLOG flag from being included twice during compilation:

clang++ -o msgq_repo/msgq/ipc_pyx.o -c -std=c++1z -DSWAGLOG=""common/swaglog.h"" -g -fPIC -O2 -Wunused -Wshadow -Wno-unknown-warning-option -Wno-deprecated-register -Wno-register -Wno-inconsistent-missing-override -Wno-c99-designator -Wno-reorder-init-list -Wno-error=unused-but-set-variable -Wno-vla-cxx-extension -DSWAGLOG=""common/swaglog.h"" -Wno-#warnings -Wno-shadow -Wno-deprecated-declarations -I. -Ithird_party/acados/include -Ithird_party/acados/include/blasfeo/include -Ithird_party/acados/include/hpipm/include -Ithird_party/catch2/include -Ithird_party/libyuv/include -Ithird_party/json11 -Ithird_party/linux/include -Ithird_party/snpe/include -Ithird_party/qrcode -Ithird_party -Icereal -Imsgq -Iopendbc/can -I/home/dean/.pyenv/versions/3.11.4/include/python3.11 -I.venv/lib/python3.11/site-packages/numpy/core/include msgq_repo/msgq/ipc_pyx.cpp
clang++ -o msgq_repo/msgq/msgq_tests.o -c -std=c++1z -DSWAGLOG=""common/swaglog.h"" -g -fPIC -O2 -Wunused -Werror -Wshadow -Wno-unknown-warning-option -Wno-deprecated-register -Wno-register -Wno-inconsistent-missing-override -Wno-c99-designator -Wno-reorder-init-list -Wno-error=unused-but-set-variable -Wno-vla-cxx-extension -DSWAGLOG=""common/swaglog.h"" -I. -Ithird_party/acados/include -Ithird_party/acados/include/blasfeo/include -Ithird_party/acados/include/hpipm/include -Ithird_party/catch2/include -Ithird_party/libyuv/include -Ithird_party/json11 -Ithird_party/linux/include -Ithird_party/snpe/include -Ithird_party/qrcode -Ithird_party -Icereal -Imsgq -Iopendbc/can -Ithird_party/json11 msgq_repo/msgq/msgq_tests.cc
clang++ -o msgq_repo/msgq/test_runner.o -c -std=c++1z -DSWAGLOG=""common/swaglog.h"" -g -fPIC -O2 -Wunused -Werror -Wshadow -Wno-unknown-warning-option -Wno-deprecated-register -Wno-register -Wno-inconsistent-missing-override -Wno-c99-designator -Wno-reorder-init-list -Wno-error=unused-but-set-variable -Wno-vla-cxx-extension -DSWAGLOG=""common/swaglog.h"" -I. -Ithird_party/acados/include -Ithird_party/acados/include/blasfeo/include -Ithird_party/acados/include/hpipm/include -Ithird_party/catch2/include -Ithird_party/libyuv/include -Ithird_party/json11 -Ithird_party/linux/include -Ithird_party/snpe/include -Ithird_party/qrcode -Ithird_party -Icereal -Imsgq -Iopendbc/can -Ithird_party/json11 msgq_repo/msgq/test_runner.cc
clang++ -o msgq_repo/msgq/visionipc/test_runner.o -c -std=c++1z -DSWAGLOG=""common/swaglog.h"" -g -fPIC -O2 -Wunused -Werror -Wshadow -Wno-unknown-warning-option -Wno-deprecated-register -Wno-register -Wno-inconsistent-missing-override -Wno-c99-designator -Wno-reorder-init-list -Wno-error=unused-but-set-variable -Wno-vla-cxx-extension -DSWAGLOG=""common/swaglog.h"" -I. -Ithird_party/acados/include -Ithird_party/acados/include/blasfeo/include -Ithird_party/acados/include/hpipm/include -Ithird_party/catch2/include -Ithird_party/libyuv/include -Ithird_party/json11 -Ithird_party/linux/include -Ithird_party/snpe/include -Ithird_party/qrcode -Ithird_party -Icereal -Imsgq -Iopendbc/can -Ithird_party/json11 msgq_repo/msgq/visionipc/test_runner.cc
....
...

The flag has been removed from cflags because it is not needed there, avoiding redundancy.

Copy link
Contributor

Thanks for contributing to openpilot! In order for us to review your PR as quickly as possible, check the following:

  • Convert your PR to a draft unless it's ready to review
  • Read the contributing docs
  • Before marking as "ready for review", ensure:
    • the goal is clearly stated in the description
    • all the tests are passing
    • the change is something we merge
    • include a route or your device' dongle ID if relevant

@adeebshihadeh
Copy link
Contributor

trigger-jenkins

@adeebshihadeh adeebshihadeh merged commit 2da4aef into commaai:master Jul 25, 2024
17 of 18 checks passed
@deanlee deanlee deleted the scons_remove_redundant_flag branch July 25, 2024 21:00
Edison-CBS pushed a commit to Edison-CBS/openpilot that referenced this pull request Sep 15, 2024
remove redundant_-DSWAGLOG Flag
old-commit-hash: 2da4aef
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants