Changeset 2168 for box/trunk/infrastructure

Timestamp:

28/05/2008 13:03:59 (4 years ago)

Author:

chris

Message:

Remove redundant copies of flags from make command line.

Place CXXFLAGS and LDFLAGS in Makefiles so that they can be overridden
by users who know what they are doing.

Add LDADD_RDYNAMIC to LDFLAGS to enable -rdynamic for symbolic stack
traces.

Location:

box/trunk/infrastructure

Files:

• BoxPlatform.pm.in (modified) (1 diff)
• makebuildenv.pl.in (modified) (4 diffs)

box/trunk/infrastructure/BoxPlatform.pm.in

@@ -33 +33 @@
 
         # blank extra flags by default
-        $platform_compile_line_extra = '@CPPFLAGS@ @CXXFLAGS@ @CXXFLAGS_STRICT@';
-        $platform_compile_line_extra =~ s/ -O2//;
-        $platform_link_line_extra = '@LDFLAGS@';
+        $platform_compile_line_extra = '';
+        $platform_link_line_extra = '';
         $platform_lib_files = '@LIBS@';
         $platform_exe_ext = '@EXEEXT@';

box/trunk/infrastructure/makebuildenv.pl.in

@@ -516 +516 @@
         my $debug_link_extra = ($target_is_library)?'':'../../debug/lib/debug/debug.a';
 
+        my $default_cxxflags = '@CXXFLAGS@';
+        my $default_cxxflags =~ s/ -O2//g;
+
         my $release_flags = "-O2";
         if ($target_windows)
@@ -533 +536 @@
 PERL = @PERL@
 WINDRES = windres
+
+CXXFLAGS = @CPPFLAGS@ $default_cxxflags @CXXFLAGS_STRICT@ \\
+        $include_paths $extra_platform_defines \\
+        -DBOX_VERSION="\\"$product_version\\""
+LDFLAGS = @LDFLAGS@ @LDADD_RDYNAMIC@
+
 .ifdef RELEASE
-CXXFLAGS = -DNDEBUG $release_flags @CXXFLAGS_STRICT@ $include_paths $extra_platform_defines -DBOX_VERSION="\\"$product_version\\""
+CXXFLAGS += -DNDEBUG $release_flags
 OUTBASE = ../../release
 OUTDIR = ../../release/$mod
@@ -540 +549 @@
 VARIENT = RELEASE
 .else
-CXXFLAGS = -g @CXXFLAGS_STRICT@ $include_paths $extra_platform_defines -DBOX_VERSION="\\"$product_version\\""
+CXXFLAGS += -g
 OUTBASE = ../../debug
 OUTDIR = ../../debug/$mod
@@ -798 +807 @@
         
                 # link line...
-                print MAKE "\t\$(_LINK) $link_line_extra -o $end_target $o_file_list $lib_files$lo $platform_lib_files\n";
+                print MAKE "\t\$(_LINK) \$(LDFLAGS) $link_line_extra " .
+                        "-o $end_target $o_file_list " .
+                        "$lib_files$lo $platform_lib_files\n";
         }
         # tests need to copy the test file over