Makefile: Better respect CFLAGS and CXXFLAGS as environment variables. #7772
Conversation
|
Actually, I think I still need to hook up other Makefiles that include |
|
I updated the other Makefiles and force pushed the changes. I think they should have no change in behavior now, but I am not in a position to test them personally. |
|
One extra benefit of this is that it will allow the user to compile C and C++ code with different compile flags. |
|
Is this PR ready now? |
|
It should be, but it would be nice if someone can take a look at other Makefiles and make sure I didn't do something wrong. Unfortunately travis doesn't test them yet... |
|
@bparker06 When you have a chance can you take a look at this PR and see if you see anything wrong? This issue has been bugging me for a while, but given how Makefile.common is used in so many places it was hard to fix... |
This fixes a few subtle problems with passing CFLAGS and CXXFLAGS as environment variables for configure. First it will now only add these variables to config.mk when they are actually set. If they are unset then the default optimizations in the Makefile are set. This avoids passing more than one conflicting optimization level to the compiler. Next all CFLAGS are added to CXXFLAGS to avoid issues with forgetting to set both CFLAGS and CXXFLAGS. This results in the cxx compiler getting passed several redundant optimization levels when both the CFLAGS and CXXFLAGS environment variabls are used. Now these uses of CFLAGS in Makefile.common are set to DEF_FLAGS. This allows adding $(DEF_FLAGS) to the CXXFLAGS variable without adding redundant flags from CFLAGS. v2: Update other build files.
|
Conflict fixed. |
|
@fjtrujy Since you seem able of testing a lot of platforms would mind testing this PR and make sure everything still builds right? :) |
Please wait for travis, I only tested the qb build system.
Description
This fixes a few subtle problems with passing CFLAGS and CXXFLAGS as environment variables for configure.
First it will now only add these variables to config.mk when they are actually set. If they are unset then the default optimizations in the Makefile are set. This avoids passing more than one conflicting optimization level to the compiler.
Next all CFLAGS are added to CXXFLAGS to avoid issues with forgetting to set both CFLAGS and CXXFLAGS. This results in the cxx compiler getting passed several redundant optimization levels when both the CFLAGS and CXXFLAGS environment variabls are used. Now these uses of CFLAGS in Makefile.common are set to DEF_FLAGS. This allows adding $(DEF_FLAGS) to the CXXFLAGS variable without adding redundant flags from CFLAGS.