diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.Linux | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux index 9c386acad3b..80318cfce55 100644 --- a/cpp/config/Make.rules.Linux +++ b/cpp/config/Make.rules.Linux @@ -18,11 +18,11 @@ MACHINE = $(shell uname -m) # Default compiler is c++ (aka g++). # ifeq ($(CXX),) - CXX := c++ + CXX = c++ endif ifeq ($(CXX),g++) - CXX := c++ + CXX = c++ endif ifeq ($(CXX),c++) @@ -31,8 +31,8 @@ ifeq ($(CXX),c++) # # We are an ultra, at least, and so have the atomic instructions # - USE_SPARC_ASM = yes - CXXARCHFLAGS := -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM + USE_SPARC_ASM = yes + CXXARCHFLAGS = -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM endif ifeq ($(MACHINE),sparc) @@ -41,41 +41,41 @@ ifeq ($(CXX),c++) # On sun4m, there is a bug in some CPU/kernel/gcc configurations which # prevent us from using '-mcpu=v8' # - USE_SPARC_ASM = no - CXXARCHFLAGS := -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED + USE_SPARC_ASM = no + CXXARCHFLAGS = -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED endif ifeq ($(MACHINE),x86_64) ifeq ($(LP64),yes) - CXXARCHFLAGS := -m64 + CXXARCHFLAGS += -m64 else - CXXARCHFLAGS := -m32 + CXXARCHFLAGS += -m32 endif - lp64suffix := 64 + lp64suffix = 64 endif CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT ifeq ($(STATICLIBS),) - CXXFLAGS := -fPIC + CXXFLAGS += -fPIC endif ifeq ($(OPTIMIZE),yes) - CXXFLAGS := -O3 -DNDEBUG $(CXXFLAGS) + CXXFLAGS += -O3 -DNDEBUG else - CXXFLAGS := -g $(CXXFLAGS) + CXXFLAGS += -g endif ifeq ($(USE_SPARC_ASM),yes) - CFLAGS := -O3 -mcpu=ultrasparc -pipe -DNDEBUG -DUSE_SPARC_ASM + CFLAGS = -O3 -mcpu=ultrasparc -pipe -DNDEBUG -DUSE_SPARC_ASM ifeq ($(STATICLIBS),) - CFLAGS := -fPIC + CFLAGS += -fPIC endif endif ifeq ($(USE_SPARC_ASM),no) - CFLAGS := -O3 -mcpu=v8 -pipe -DNDEBUG -DICE_USE_MUTEX_SHARED + CFLAGS = -O3 -mcpu=v8 -pipe -DNDEBUG -DICE_USE_MUTEX_SHARED ifeq ($(STATICLIBS),) - CFLAGS := -fPIC + CFLAGS += -fPIC endif endif @@ -95,13 +95,13 @@ ifeq ($(CXX),icpc) CXXFLAGS = -D_REENTRANT ifeq ($(STATICLIBS),) - CXXFLAGS := -fPIC + CXXFLAGS += -fPIC endif ifeq ($(OPTIMIZE),yes) - CXXFLAGS := -O3 -DNDEBUG $(CXXFLAGS) + CXXFLAGS += -O3 -DNDEBUG else - CXXFLAGS := -g $(CXXFLAGS) + CXXFLAGS += -g endif # @@ -121,6 +121,6 @@ LIBS = -lIce $(BASELIBS) ICEUTIL_OS_LIBS = ICE_OS_LIBS = -ldl -PLATFORM_HAS_READLINE := yes +PLATFORM_HAS_READLINE = yes export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) |