summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/makeinclude/platform_chorus.GNU52
1 files changed, 26 insertions, 26 deletions
diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU
index 5fc6a159c5f..587da8bb457 100644
--- a/include/makeinclude/platform_chorus.GNU
+++ b/include/makeinclude/platform_chorus.GNU
@@ -13,40 +13,40 @@ static_libs = 1
#
# The following file includes definitions such as $(CC), $(XDIR), etc.
#
-include $(CLASSIXDIR)/dtool/htgt-cf.rf
+include $(MERGEDIR)/dtool/htgt-cf.rf
#
# Tool PATH
#
-TOOLDIR = $(XDIR)/bin/
+TOOLDIR = $(XDIR)/bin/
INC_DIR = $(CLASSIXDIR)/include
-BIN_DIR =
-LIB_DIR = $(CLASSIXDIR)/lib
-#CC = gcc
-#CXX = g++
+BIN_DIR =
+LIB_DIR = $(CLASSIXDIR)/lib
+#CC = gcc
+#CXX = g++
CXX = $(CC)
-CFLAGS += -w
-CCFLAGS += $(CFLAGS) -fno-implicit-templates \
- -fno-strict-prototypes \
- -nostdinc \
- -D_POSIX_THREADS \
- -D_POSIX_THREAD_SAFE_FUNCTIONS
-DCFLAGS += -gstabs+
-INCLDIRS += -I$(INC_DIR)/posix \
- -I$(INC_DIR)/stdc \
- -I$(INC_DIR)/chorus/ \
- -I$(INC_DIR)/chorus/iom \
- -I$(INC_DIR)/CC
+CFLAGS += -w
+CCFLAGS += $(CFLAGS) -fno-implicit-templates \
+ -fno-strict-prototypes \
+ -nostdinc \
+ -D_POSIX_THREADS \
+ -D_POSIX_THREAD_SAFE_FUNCTIONS
+DCFLAGS += -gstabs+
+INCLDIRS += -I$(INC_DIR)/posix \
+ -I$(INC_DIR)/stdc \
+ -I$(INC_DIR)/chorus/ \
+ -I$(INC_DIR)/chorus/iom \
+ -I$(INC_DIR)/CC
DLD =
LD = $(CXX)
-LDFLAGS += -r -Ur -nostdlib \
- -L$(LIB_DIR)/CC \
- -L$(LIB_DIR)/classix
+LDFLAGS += -r -Ur -nostdlib \
+ -L$(LIB_DIR)/CC \
+ -L$(LIB_DIR)/classix
-OCFLAGS += -O2
-PIC = -fPIC
+OCFLAGS += -O2
+PIC = -fPIC
-AR = $(TOOLDIR)ar
-ARFLAGS = srv
+AR = $(TOOLDIR)ar
+ARFLAGS = srv
-RANLIB = $(TOOLDIR)ranlib
+RANLIB = $(TOOLDIR)ranlib
PRELIB = @true