From e11e4bf2bf75e36d5ec1dd2627e545606e9f0ac3 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Fri, 4 Jan 2019 08:55:26 +0100
Subject: [PATCH] do not patch druntime/phobos win64.mak

---
 src/diff-druntime-win64.diff | 36 -----------------
 src/diff-phobos-win64.diff   | 77 ------------------------------------
 src/do_fixup.sh              |  2 -
 src/setup_env.sh             |  2 +-
 4 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 src/diff-druntime-win64.diff
 delete mode 100644 src/diff-phobos-win64.diff

diff --git a/src/diff-druntime-win64.diff b/src/diff-druntime-win64.diff
deleted file mode 100644
index 76169b4..0000000
--- a/src/diff-druntime-win64.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/win64.mak b/win64.mak
-index 5ca1382f..88ea77e0 100644
---- a/win64.mak
-+++ b/win64.mak
-@@ -2,17 +2,14 @@
- 
- MODEL=64
- 
--VCDIR=\Program Files (x86)\Microsoft Visual Studio 10.0\VC
--SDKDIR=\Program Files (x86)\Microsoft SDKs\Windows\v7.0A
--
- DMD_DIR=..\dmd
- BUILD=release
- OS=windows
- DMD=$(DMD_DIR)\generated\$(OS)\$(BUILD)\$(MODEL)\dmd
- 
--CC="$(VCDIR)\bin\amd64\cl"
--LD="$(VCDIR)\bin\amd64\link"
--AR="$(VCDIR)\bin\amd64\lib"
-+CC="$(VCBIN_DIR)\cl"
-+LD="$(VCBIN_DIR)\link"
-+AR="$(VCBIN_DIR)\lib"
- CP=cp
- 
- DOCDIR=doc
-@@ -24,8 +21,8 @@ DFLAGS=-m$(MODEL) -conf= -O -release -dip1000 -inline -w -Isrc -Iimport
- UDFLAGS=-m$(MODEL) -conf= -O -release -dip1000 -w -Isrc -Iimport
- DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
- 
--#CFLAGS=/O2 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
--CFLAGS=/Z7 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
-+#CFLAGS=/O2 /I"$(VCINSTALLDIR)"\INCLUDE /I"$(WindowsSdkDir)"\Include
-+CFLAGS=/Z7 /I"$(VCINSTALLDIR)"\INCLUDE /I"$(WindowsSdkDir)"\Include
- 
- DRUNTIME_BASE=druntime$(MODEL)
- DRUNTIME=lib\$(DRUNTIME_BASE).lib
diff --git a/src/diff-phobos-win64.diff b/src/diff-phobos-win64.diff
deleted file mode 100644
index 2d60581..0000000
--- a/src/diff-phobos-win64.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/etc/c/zlib/win64.mak b/etc/c/zlib/win64.mak
-index ced2ced27..ec9bc7779 100644
---- a/etc/c/zlib/win64.mak
-+++ b/etc/c/zlib/win64.mak
-@@ -1,13 +1,12 @@
- # Makefile for zlib64
- 
- MODEL=64
--VCDIR=\Program Files (x86)\Microsoft Visual Studio 10.0\VC
- 
--CC="$(VCDIR)\bin\amd64\cl"
--LD="$(VCDIR)\bin\amd64\link"
--LIB="$(VCDIR)\bin\amd64\lib"
-+CC="$(VCBIN_DIR)\cl"
-+LD="$(VCBIN_DIR)\link"
-+LIB="$(VCBIN_DIR)\lib"
- 
--CFLAGS=/O2 /nologo /I"$(VCDIR)\INCLUDE"
-+CFLAGS=/O2 /nologo /I"$(VCINSTALLDIR)\INCLUDE"
- LIBFLAGS=/nologo
- LDFLAGS=/nologo
- O=.obj
-diff --git a/win64.mak b/win64.mak
-index 38375d2e4..b9cd15c08 100644
---- a/win64.mak
-+++ b/win64.mak
-@@ -28,14 +28,10 @@ CP=cp
- 
- DIR=\dmd2
- 
--## Visual C directories
--VCDIR=\Program Files (x86)\Microsoft Visual Studio 10.0\VC
--SDKDIR=\Program Files (x86)\Microsoft SDKs\Windows\v7.0A
--
- ## Flags for VC compiler
- 
--#CFLAGS=/Zi /nologo /I"$(VCDIR)\INCLUDE" /I"$(SDKDIR)\Include"
--CFLAGS=/O2 /nologo /I"$(VCDIR)\INCLUDE" /I"$(SDKDIR)\Include"
-+#CFLAGS=/Zi /nologo /I"$(VCINSTALLDIR)\INCLUDE" /I"$(WindowsSdkDir)\Include"
-+CFLAGS=/O2 /nologo /I"$(VCINSTALLDIR)\INCLUDE" /I"$(WindowsSdkDir)\Include"
- 
- ## Location of druntime tree
- 
-@@ -54,9 +50,9 @@ UDFLAGS=-conf= -g -m$(MODEL) -O -w -dip25 -I$(DRUNTIME)\import -unittest
- 
- ## C compiler, linker, librarian
- 
--CC="$(VCDIR)\bin\amd64\cl"
--LD="$(VCDIR)\bin\amd64\link"
--AR="$(VCDIR)\bin\amd64\lib"
-+CC="$(VCBIN_DIR)\cl"
-+LD="$(VCBIN_DIR)\link"
-+AR="$(VCBIN_DIR)\lib"
- MAKE=make
- 
- ## D compiler
-@@ -500,17 +496,17 @@ CC32=$(CC)\..\..\cl
- 
- # build phobos32mscoff.lib
- phobos32mscoff:
--	$(MAKE) -f win64.mak "DMD=$(DMD)" "MAKE=$(MAKE)" MODEL=32mscoff "CC=\$(CC32)"\"" "AR=\$(AR)"\"" "VCDIR=$(VCDIR)" "SDKDIR=$(SDKDIR)"
-+	$(MAKE) -f win64.mak "DMD=$(DMD)" "MAKE=$(MAKE)" MODEL=32mscoff "CC=\$(CC32)"\"" "AR=\$(AR)"\""
- 
- # run unittests for 32-bit COFF version
- unittest32mscoff:
--	$(MAKE) -f win64.mak "DMD=$(DMD)" "MAKE=$(MAKE)" MODEL=32mscoff "CC=\$(CC32)"\"" "AR=\$(AR)"\"" "VCDIR=$(VCDIR)" "SDKDIR=$(SDKDIR)" unittest
-+	$(MAKE) -f win64.mak "DMD=$(DMD)" "MAKE=$(MAKE)" MODEL=32mscoff "CC=\$(CC32)"\"" "AR=\$(AR)"\""
- 
- ######################################################
- 
- $(ZLIB): $(SRC_ZLIB)
- 	cd etc\c\zlib
--	$(MAKE) -f win64.mak MODEL=$(MODEL) zlib$(MODEL).lib "CC=\$(CC)"\"" "LIB=\$(AR)"\"" "VCDIR=$(VCDIR)"
-+	$(MAKE) -f win64.mak MODEL=$(MODEL) zlib$(MODEL).lib "CC=\$(CC)"\"" "LIB=\$(AR)"\""
- 	cd ..\..\..
- 
- ######################################################
diff --git a/src/do_fixup.sh b/src/do_fixup.sh
index 18d5904..f598920 100755
--- a/src/do_fixup.sh
+++ b/src/do_fixup.sh
@@ -19,7 +19,5 @@ if [ "x$3" == "x1" -a "x${2:0:4}" == "xWin_" ]; then
 
     # fix VC path issues
     (cd $1/dmd; patch -p1 < ../../src/diff-dmd-win64.diff)
-    (cd $1/druntime; patch -p1 < ../../src/diff-druntime-win64.diff)
-    (cd $1/phobos; patch -p1 < ../../src/diff-phobos-win64.diff)
 fi
 
diff --git a/src/setup_env.sh b/src/setup_env.sh
index 0bd76a5..97a462e 100644
--- a/src/setup_env.sh
+++ b/src/setup_env.sh
@@ -60,7 +60,7 @@ case "$1" in
         ;;
     Win_32_64)
         makefile=win64.mak
-        EXTRA_ARGS=""
+        EXTRA_ARGS="\"CC=$VCBIN_DIR/cl\" AR=\"$VCBIN_DIR/lib\" VCDIR=\"$VCINSTALLDIR\" SDKDIR=\"$WindowsSdkDir\""
         EXE=.exe
         OUTPUT_MODEL=64
         ;;