Merge compile_option into CXX_FLAGS

10 files changed, 19 insertions, 27 deletions

diff --git a/configure.py b/configure.py
index 53d3a3eda..893f6f589 100755
--- a/configure.py
+++ b/configure.py
@@ -779,7 +779,6 @@ class CompilerInfo(object):
                       { 'binary_name': None,
                         'linker_name': None,
                         'macro_name': None,
-                        'compile_option': '-c ',
                         'output_to_option': '-o ',
                         'add_include_dir_option': '-I',
                         'add_lib_dir_option': '-L',
@@ -1139,13 +1138,12 @@ def gen_makefile_lists(var, build_config, options, modules, cc, arch, osinfo):
     """
     def build_commands(sources, obj_dir, flags):
         for (obj_file,src) in zip(objectfile_list(sources, obj_dir), sources):
-            yield '%s: %s\n\t$(CXX)%s $(%s_FLAGS) %s%s %s%s %s$@\n' % (
+            yield '%s: %s\n\t$(CXX)%s $(%s_FLAGS) %s%s %s %s$@\n' % (
                 obj_file, src,
                 isa_specific_flags(cc, src),
                 flags,
                 cc.add_include_dir_option,
                 build_config.include_dir,
-                cc.compile_option,
                 src,
                 cc.output_to_option)
 
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 5921f634c..e0520d946 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -2,7 +2,6 @@ macro_name CLANG
 
 binary_name clang++
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
@@ -13,8 +12,8 @@ lang_flags "-std=c++11 -D_REENTRANT -fstack-protector"
 warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wunreachable-code"
 maintainer_warning_flags "-Qunused-arguments -Werror -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=unreachable-code"
 
-compile_flags_release ""
-compile_flags_debug   "-g"
+compile_flags_release "-c"
+compile_flags_debug   "-c -g"
 lib_opt_flags_release "-O3"
 app_opt_flags_release "-O2"
 
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index d306d5b11..2390c3cd2 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -2,13 +2,13 @@ macro_name PATHSCALE
 
 binary_name pathCC
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
 add_lib_option -l
 
-compile_flags_debug "-g"
+compile_flags_release "-c"
+compile_flags_debug "-c -g"
 lib_opt_flags_release "-O3 -OPT:Ofast:alias=disjoint"
 app_opt_flags_release "-O2"
 
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 58ba89870..d7b35a7f0 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -2,7 +2,6 @@ macro_name GCC
 
 binary_name g++
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
@@ -12,8 +11,8 @@ lang_flags "-std=c++11 -D_REENTRANT"
 maintainer_warning_flags "-Wold-style-cast -Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=strict-overflow"
 warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant"
 
-compile_flags_release ""
-compile_flags_debug   "-g"
+compile_flags_release "-c"
+compile_flags_debug   "-c -g"
 lib_opt_flags_release "-O2"
 lib_opt_flags_debug   "-O0"
 app_opt_flags_release "-O2"
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 518a39346..0e7f6b6ab 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -2,14 +2,13 @@ macro_name HP_ACC
 
 binary_name aCC
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
 add_lib_option -l
 
-compile_flags_release ""
-compile_flags_debug "-g"
+compile_flags_release "-c"
+compile_flags_debug "-c -g"
 lib_opt_flags_release "+O2"
 app_opt_flags_release "+O2"
 
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index debe25362..43b9a524e 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -2,14 +2,13 @@ macro_name INTEL
 
 binary_name icpc
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
 add_lib_option -l
 
-compile_flags_release "-fomit-frame-pointer"
-compile_flags_debug "-g"
+compile_flags_release "-c -fomit-frame-pointer"
+compile_flags_debug "-c -g"
 lib_opt_flags_release "-O2 -ip -unroll"
 app_opt_flags_release "-O2"
 
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 854edb60d..8c80cc9f0 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -3,14 +3,13 @@ macro_name MSVC
 binary_name cl
 linker_name link
 
-compile_option "/nologo /c "
 output_to_option "/Fo"
 add_include_dir_option "/I"
 add_lib_dir_option -L
 add_lib_option ""
 
-compile_flags_release "/bigobj /O2"
-compile_flags_debug   "/bigobj /Od /Zi /FS /DEBUG"
+compile_flags_release "/nologo /c /bigobj /O2"
+compile_flags_debug   "/nologo /c /bigobj /Od /Zi /FS /DEBUG"
 app_opt_flags_release "/D_CONSOLE"
 app_opt_flags_debug   "/D_CONSOLE"
 
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 6b41974e5..3ef16c7df 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -2,12 +2,13 @@ macro_name PORTLAND_GROUP
 
 binary_name pgCC
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
 add_lib_option -l
 
+compile_flags_release "-c"
+compile_flags_debug "-c"
 lib_opt_flags_release "-fast -Minline"
 app_opt_flags_release "-fast"
 shared_flags "-fPIC"
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index e98e15363..c8673a8c1 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -2,14 +2,13 @@ macro_name SUN_STUDIO
 
 binary_name CC
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
 add_lib_option -l
 
-compile_flags_release ""
-compile_flags_debug "-g"
+compile_flags_release "-c"
+compile_flags_debug "-c -g"
 lib_opt_flags_release "-xO5"
 app_opt_flags_release "-xO2"
 
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index e1eded5fa..78fda3198 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -2,14 +2,13 @@ macro_name IBM_XLC
 
 binary_name xlC
 
-compile_option "-c "
 output_to_option "-o "
 add_include_dir_option -I
 add_lib_dir_option -L
 add_lib_option -l
 
-compile_flags_release ""
-compile_flags_debug "-g"
+compile_flags_release "-c"
+compile_flags_debug "-c -g"
 lib_opt_flags_release "-O2"
 app_opt_flags_release "-O2"