httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1333556 - in /httpd/httpd/branches/2.0.x/build: NWGNUenvironment.inc NWGNUmakefile
Date Thu, 03 May 2012 17:13:05 GMT
Author: fuankg
Date: Thu May  3 17:13:05 2012
New Revision: 1333556

URL: http://svn.apache.org/viewvc?rev=1333556&view=rev
Log:
NetWare build system: added vars for Linux build.

Modified:
    httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.0.x/build/NWGNUmakefile

Modified: httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc?rev=1333556&r1=1333555&r2=1333556&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.0.x/build/NWGNUenvironment.inc Thu May  3 17:13:05 2012
@@ -201,12 +201,19 @@ CLIB3S	= $(METROWERKS)/Novell Support/Me
 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.

Modified: httpd/httpd/branches/2.0.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/build/NWGNUmakefile?rev=1333556&r1=1333555&r2=1333556&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.0.x/build/NWGNUmakefile Thu May  3 17:13:05 2012
@@ -79,7 +79,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCR
 
 %.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 $
 
 %.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
 



Mime
View raw message