|
|
@@ -11,6 +11,7 @@
|
|
|
BSDs = freebsd netbsd openbsd darwin
|
|
|
UNIXs = linux $(BSDs) solaris qnx
|
|
|
LIMIT83fs = go32v2 os2 emx watcom
|
|
|
+OSNeedsComspecToRunBatch = go32v2 watcom
|
|
|
|
|
|
#Empty target for rules that always should run. Needed if
|
|
|
#the target is non-phoney, and there is non-phony prereqisites.
|
|
|
@@ -94,6 +95,12 @@ SRCBATCHEXT=.bat
|
|
|
endif
|
|
|
endif
|
|
|
|
|
|
+ifdef COMSPEC
|
|
|
+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
|
|
|
+RUNBATCH=$(COMSPEC) /C
|
|
|
+endif
|
|
|
+endif
|
|
|
+
|
|
|
# Path Separator, the subst trick is necessary for the \ that can't exists
|
|
|
# at the end of a line
|
|
|
ifdef inUnix
|
|
|
@@ -1262,7 +1269,7 @@ endif
|
|
|
|
|
|
ifndef CROSSBOOTSTRAP
|
|
|
ifneq ($(BINUTILSPREFIX),)
|
|
|
-override FPCOPT+=-XP$(BINUTILSPREFIX)
|
|
|
+override FPCOPT+=-XP$(BINUTILSPREFIX)
|
|
|
endif
|
|
|
ifneq ($(BINUTILSPREFIX),)
|
|
|
override FPCOPT+=-Xr$(RLINKPATH)
|
|
|
@@ -1455,9 +1462,13 @@ ifeq (,$(findstring -s ,$(COMPILER)))
|
|
|
EXECPPAS=
|
|
|
else
|
|
|
ifeq ($(FULL_SOURCE),$(FULL_TARGET))
|
|
|
+ifdef RUNBATCH
|
|
|
+EXECPPAS:=@$(RUNBATCH) $(PPAS)
|
|
|
+else
|
|
|
EXECPPAS:=@$(PPAS)
|
|
|
endif
|
|
|
endif
|
|
|
+endif
|
|
|
|
|
|
|
|
|
[loaderrules]
|
|
|
@@ -1885,6 +1896,9 @@ else
|
|
|
endif
|
|
|
ifdef inUnix
|
|
|
/bin/sh $(ZIPWRAPPER)
|
|
|
+else
|
|
|
+ifdef RUNBATCH
|
|
|
+ $(RUNBATCH) (ZIPWRAPPER)
|
|
|
else
|
|
|
$(ZIPWRAPPER)
|
|
|
endif
|
pierre