1
diff -Nur -x '*.orig' -x '*~' zeroc-ice/cpp/config/Make.rules.Linux zeroc-ice.new/cpp/config/Make.rules.Linux
2
--- zeroc-ice/cpp/config/Make.rules.Linux 2008-04-05 19:34:33.000000000 +0200
3
+++ zeroc-ice.new/cpp/config/Make.rules.Linux 2008-04-05 19:37:20.000000000 +0200
6
# icecpp is built with a C compiler
11
ifeq ($(MACHINE),x86_64)
16
ifeq ($(OPTIMIZE),yes)
17
- CXXFLAGS += -O2 -DNDEBUG
18
+ CXXFLAGS += -g -O2 -DNDEBUG
23
ifeq ($(USE_SPARC_ASM),yes)
24
- CFLAGS = -O2 -mcpu=ultrasparc -pipe -DNDEBUG -DUSE_SPARC_ASM
25
+ CFLAGS = -g -O2 -mcpu=ultrasparc -pipe -DNDEBUG -DUSE_SPARC_ASM
30
ifeq ($(USE_SPARC_ASM),no)
31
- CFLAGS = -O2 -mcpu=v8 -pipe -DNDEBUG -DICE_USE_MUTEX_SHARED
32
+ CFLAGS = -g -O2 -mcpu=v8 -pipe -DNDEBUG -DICE_USE_MUTEX_SHARED
1
--- a/cpp/config/Make.rules.Linux
2
+++ b/cpp/config/Make.rules.Linux
5
# We are an ultra, at least, and so have the atomic instructions
7
- $(warning ===================================================================)
8
+ $(warning ===================================================================)
9
$(warning Linux on SPARC is currently unsupported. The Ice team does not)
10
$(warning maintain SPARC specific portions of the source code or build)
11
$(warning system. Contact sales@zeroc.com if you wish to sponsor official)
13
- $(warning ===================================================================)
14
+ $(warning ===================================================================)
16
CXXARCHFLAGS += -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM
19
# On sun4m, there is a bug in some CPU/kernel/gcc configurations which
20
# prevent us from using '-mcpu=v8'
22
- $(warning ===================================================================)
23
+ $(warning ===================================================================)
24
$(warning Linux on SPARC is currently unsupported. The Ice team does not)
25
$(warning maintain SPARC specific portions of the source code or build)
26
$(warning system. Contact sales@zeroc.com if you wish to sponsor official)
28
- $(warning ===================================================================)
29
+ $(warning ===================================================================)
31
CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED
36
ifeq ($(OPTIMIZE),yes)
37
- CXXFLAGS += -O2 -DNDEBUG
38
+ CXXFLAGS += -g -O2 -DNDEBUG
47
mklib = ar cr $(1) $(2)
49
- rpathlink = -Wl,-rpath-link,$(1)
50
+ rpathlink = -Wl,-rpath-link,$(1)
52
ifneq ($(embedded_runpath_prefix),)
53
- LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,$(runpath_libdir)
54
+ LDPLATFORMFLAGS = -Wl,--enable-new-dtags
56
LDPLATFORMFLAGS = -Wl,--enable-new-dtags
62
- $(warning ===================================================================)
63
+ $(warning ===================================================================)
64
$(warning Intel C++ is currently not supported. The Ice team does not)
65
$(warning maintain Intel C++ specific portions of the source code or build)
66
$(warning system. Contact sales@zeroc.com if you wish to sponsor official)
68
- $(warning ===================================================================)
69
- CXXFLAGS = -D_REENTRANT
70
+ $(warning ===================================================================)
71
+ CXXFLAGS = -D_REENTRANT
77
ifeq ($(OPTIMIZE),yes)
78
- CXXFLAGS += -O2 -DNDEBUG
79
+ CXXFLAGS += -g -O2 -DNDEBUG
36
83
@@ -136,7 +136,7 @@
39
ifeq ($(OPTIMIZE),yes)
40
- CXXFLAGS += -O2 -DNDEBUG
41
+ CXXFLAGS += -g -O2 -DNDEBUG
85
mklib = ar cr $(1) $(2)
87
- rpathlink = -Wl,-rpath-link,$(1)
88
+ rpathlink = -Wl,-rpath-link,$(1)
93
QT_RPATH_LINK = $(call rpathlink,$(QT_HOME)/$(libsubdir))
100
PLATFORM_HAS_READLINE = yes