diff options
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/actions/make/make_cpp.lua | 16 | ||||
| -rw-r--r-- | tests/test_gmake_cpp.lua | 14 |
3 files changed, 7 insertions, 24 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index aabf72b..29c7eed 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -57,6 +57,7 @@ * Patch 3505903: Fix VC2010 project reference paths (Pavel Czerný) * Patch 3305599: Add -Wextra to ExtraWarnings (ergosys) * Patch 3476176: Fix dependencies of precompiled header in makefile (Konstantin Tokarev) +* Patch 3476176: Remove conditionals from makefile compiler assignments (Konstantin Tokarev) ------- diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua index 7069f7f..fe48cc9 100644 --- a/src/actions/make/make_cpp.lua +++ b/src/actions/make/make_cpp.lua @@ -147,19 +147,9 @@ _p('endif') _p('') - _p('ifndef CC') - _p(' CC = %s', cc.cc) - _p('endif') - _p('') - - _p('ifndef CXX') - _p(' CXX = %s', cc.cxx) - _p('endif') - _p('') - - _p('ifndef AR') - _p(' AR = %s', cc.ar) - _p('endif') + _p('CC = %s', cc.cc) + _p('CXX = %s', cc.cxx) + _p('AR = %s', cc.ar) _p('') _p('ifndef RESCOMP') diff --git a/tests/test_gmake_cpp.lua b/tests/test_gmake_cpp.lua index 3670e28..3ccd8d1 100644 --- a/tests/test_gmake_cpp.lua +++ b/tests/test_gmake_cpp.lua @@ -47,17 +47,9 @@ ifndef verbose SILENT = @ endif -ifndef CC - CC = gcc -endif - -ifndef CXX - CXX = g++ -endif - -ifndef AR - AR = ar -endif +CC = gcc +CXX = g++ +AR = ar ifndef RESCOMP ifdef WINDRES |