From: Guenter Knauf <fuankg@apache.org>
Date: Thu, 3 May 2012 17:13:05 +0000 (+0000)
Subject: NetWare build system: added vars for Linux build.
X-Git-Tag: 2.0.65~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fd58a7ad0c0345eb862d4dc063630a3d48058b7;p=thirdparty%2Fapache%2Fhttpd.git

NetWare build system: added vars for Linux build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1333556 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 7d3f75416a3..a06cffc082d 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -201,12 +201,19 @@ CLIB3S	= $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime/mwcrt
 MATH3S	=
 PLIB3S	= $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++/MWCPP.lib
 
-# MetroWerks Win32 build flags to create build tool
-MWCW_MSL   = "$(METROWERKS)/MSL"
-MWCW_W32   = "$(METROWERKS)/Win32-x86 Support"
-WIN_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
-WIN_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
-WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+ifeq "$(OS)" "Windows_NT"
+# MetroWerks Win32 build flags to create build tools
+MWCW_MSL         = "$(METROWERKS)/MSL"
+MWCW_W32         = "$(METROWERKS)/Win32-x86 Support"
+CC_FOR_BUILD     = $(WIN_CC)
+CFLAGS_FOR_BUILD =  -O2 -gccinc -nodefaults -proc 586 -w off
+CFLAGS_FOR_BUILD += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
+CFLAGS_FOR_BUILD += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+else
+# GNUC build flags to create build tools
+CC_FOR_BUILD     = gcc
+CFLAGS_FOR_BUILD = -Wall -O2
+endif
 
 # Base compile flags
 # and prefix or precompiled header added here.
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index c16842b506f..fb33d28da14 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -79,7 +79,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c
 
 %.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h
 	@echo Creating Build Helper $@
-	@$(WIN_CC) $(WIN_CFLAGS) $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
 
 $(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c
 	@echo Creating $(subst /,\,$@)
@@ -87,7 +87,7 @@ $(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c
 
 %.exe: $(AP_WORK)/server/%.c
 	@echo Creating Build Helper $@
-	@$(WIN_CC) $(WIN_CFLAGS) -DCROSS_COMPILE $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE $< -o $@
 
 else