Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update native toolchain build as well.

  • Loading branch information...
commit 10fa7f61a6835b494ff8a28f982861ab7590ebcc 1 parent 1c04003
David Cournapeau authored February 27, 2009

Showing 1 changed file with 27 additions and 42 deletions. Show diff stats Hide diff stats

  1. 69  Makefile.native
69  Makefile.native
... ...
@@ -1,4 +1,4 @@
1  
-ROOT_DIR	= /Users/david/src/cross
  1
+ROOT_DIR	= $(PWD)
2 2
 ARCHIVE_DIR	= $(ROOT_DIR)/archives
3 3
 BUILD_DIR	= $(ROOT_DIR)/native/build
4 4
 INSTALL_DIR	= $(ROOT_DIR)/native/install
@@ -6,33 +6,28 @@ INSTALL_DIR	= $(ROOT_DIR)/native/install
6 6
 TARGET		= i586-mingw32msvc
7 7
 HOST		= i586-mingw32msvc
8 8
 
9  
-BINUTILS_SRC	= $(ARCHIVE_DIR)/binutils-2.18.50
10  
-BINUTILS_BLD	= $(BUILD_DIR)/binutils-2.18.50
  9
+BINUTILS_SRC	= $(ARCHIVE_DIR)/binutils-2.19
  10
+BINUTILS_BLD	= $(BUILD_DIR)/binutils-2.19
11 11
 
12  
-MINGW32_SRC	= $(ARCHIVE_DIR)/mingw-runtime-3.14
13  
-MINGW32_BLD	= $(BUILD_DIR)/mingw-runtime-3.14
  12
+MINGW32_SRC	= $(ARCHIVE_DIR)/mingwrt-3.15.2-mingw32
  13
+MINGW32_BLD	= $(BUILD_DIR)/mingwrt-3.15.2-mingw32
14 14
 
15  
-W32API_SRC	= $(ARCHIVE_DIR)/w32api-3.11
16  
-W32API_BLD	= $(BUILD_DIR)/w32api-3.11
  15
+W32API_SRC	= $(ARCHIVE_DIR)/w32api-3.13-mingw32
  16
+W32API_BLD	= $(BUILD_DIR)/w32api-3.13-mingw32
17 17
 
18  
-GCC_BOOTSTRAP_SRC	= $(ARCHIVE_DIR)/gcc-4.3.0
19  
-GCC_BOOTSTRAP_BLD	= $(BUILD_DIR)/gcc-4.3.0-bootstrap
  18
+GMP_SRC	= $(ARCHIVE_DIR)/gmp-4.2.4
  19
+GMP_BLD	= $(BUILD_DIR)/gmp-4.2.4
20 20
 
21  
-GMP_SRC	= $(ARCHIVE_DIR)/gmp-4.2.2
22  
-GMP_BLD	= $(BUILD_DIR)/gmp-4.2.2
23  
-
24  
-MPFR_SRC	= $(ARCHIVE_DIR)/mpfr-2.3.1
25  
-MPFR_BLD	= $(BUILD_DIR)/mpfr-2.3.1
  21
+MPFR_SRC	= $(ARCHIVE_DIR)/mpfr-2.3.2
  22
+MPFR_BLD	= $(BUILD_DIR)/mpfr-2.3.2
26 23
 
27 24
 MAKE		= make -j2
28 25
 
29  
-GCC_BOOTSTRAP_CONFIGURE_OPTS	= --with-gmp=$(INSTALL_DIR) --with-mpfr=$(INSTALL_DIR) \
30  
-			--with-sysroot=$(INSTALL_DIR)
31 26
 GCC_CONFIGURE_OPTS	= --with-gmp=$(INSTALL_DIR) --with-mpfr=$(INSTALL_DIR) \
32 27
 			--with-sysroot=$(INSTALL_DIR)
33 28
 
34  
-GCC_SRC	= $(ARCHIVE_DIR)/gcc-4.3.0
35  
-GCC_BLD	= $(BUILD_DIR)/gcc-4.3.0
  29
+GCC_SRC	= $(ARCHIVE_DIR)/gcc-4.3.3
  30
+GCC_BLD	= $(BUILD_DIR)/gcc-4.3.3
36 31
 
37 32
 GCC_LANGUAGES = c,c++,fortran
38 33
 
@@ -99,22 +94,12 @@ $(GCC_BLD)/install.done:
99 94
 	(cd $(GCC_BLD) && make install)
100 95
 	touch $@
101 96
 
102  
-gcc_build: gcc_configure $(GCC_BLD)/build.done
  97
+gcc_build: w32api_install $(GCC_BLD)/build.done
103 98
 
104 99
 $(GCC_BLD)/build.done:
105 100
 	(cd $(GCC_BLD) && $(MAKE))
106 101
 	touch $@
107 102
 
108  
-gcc_configure: mingw32_install $(GCC_BLD)/configure.done
109  
-
110  
-$(GCC_BLD)/configure.done:
111  
-	mkdir -p $(GCC_BLD)
112  
-	(cd $(GCC_BLD) && $(GCC_SRC)/configure \
113  
-	--prefix=$(INSTALL_DIR) --target=$(TARGET) \
114  
-	--enable-languages=$(GCC_LANGUAGES) \
115  
-	--host=$(HOST) $(GCC_CONFIGURE_OPTS))
116  
-	touch $@
117  
-
118 103
 mingw32_install: mingw32_build $(MINGW32_BLD)/install.done
119 104
 
120 105
 $(MINGW32_BLD)/install.done:
@@ -127,7 +112,7 @@ $(MINGW32_BLD)/build.done:
127 112
 	(cd $(MINGW32_BLD) && $(MAKE))
128 113
 	touch $@
129 114
 
130  
-mingw32_configure: w32api_install $(MINGW32_BLD)/configure.done
  115
+mingw32_configure: gcc_install $(MINGW32_BLD)/configure.done
131 116
 
132 117
 $(MINGW32_BLD)/configure.done:
133 118
 	mkdir -p $(MINGW32_BLD)
@@ -157,25 +142,25 @@ $(W32API_BLD)/configure.done:
157 142
 	--host=$(TARGET))
158 143
 	touch $@
159 144
 
160  
-gcc_bootstrap_install: gcc_bootstrap_build $(GCC_BOOTSTRAP_BLD)/install.done
  145
+gcc_bootstrap_install: gcc_bootstrap_build $(GCC_BLD)/install.bootstrap.done
161 146
 
162  
-$(GCC_BOOTSTRAP_BLD)/install.done: 
163  
-	(cd $(GCC_BOOTSTRAP_BLD) && make install)
  147
+$(GCC_BLD)/install.bootstrap.done: 
  148
+	(cd $(GCC_BLD) && make install-gcc)
164 149
 	touch $@
165 150
 
166  
-gcc_bootstrap_build: gcc_bootstrap_configure $(GCC_BOOTSTRAP_BLD)/build.done
  151
+gcc_bootstrap_build: gcc_bootstrap_configure $(GCC_BLD)/build.bootstrap.done
167 152
 
168  
-$(GCC_BOOTSTRAP_BLD)/build.done: 
169  
-	(cd $(GCC_BOOTSTRAP_BLD) && $(MAKE))
  153
+$(GCC_BLD)/build.bootstrap.done: 
  154
+	(cd $(GCC_BLD) && $(MAKE) all-gcc)
170 155
 	touch $@
171 156
 
172  
-gcc_bootstrap_configure: sysheader_install $(GCC_BOOTSTRAP_BLD)/configure.done
  157
+gcc_bootstrap_configure: sysheader_install $(GCC_BLD)/configure.bootstrap.done
173 158
 
174  
-$(GCC_BOOTSTRAP_BLD)/configure.done: 
175  
-	mkdir -p $(GCC_BOOTSTRAP_BLD)
176  
-	(cd $(GCC_BOOTSTRAP_BLD) && $(GCC_BOOTSTRAP_SRC)/configure \
177  
-	--prefix=$(INSTALL_DIR) --target=$(TARGET) --enable-languages=c \
178  
-	--host=$(HOST) $(GCC_BOOTSTRAP_CONFIGURE_OPTS))
  159
+$(GCC_BLD)/configure.bootstrap.done: 
  160
+	mkdir -p $(GCC_BLD)
  161
+	(cd $(GCC_BLD) && $(GCC_SRC)/configure \
  162
+	--prefix=$(INSTALL_DIR) --target=$(TARGET) --enable-languages=$(GCC_LANGUAGES) \
  163
+	--host=$(HOST) $(GCC_CONFIGURE_OPTS))
179 164
 	touch $@
180 165
 
181 166
 sysheader_install: binutils $(BUILD_DIR)/sys.done

0 notes on commit 10fa7f6

Please sign in to comment.
Something went wrong with that request. Please try again.