Merge branch 'no_rust_submodule' into 'master'
Remove the rust submodule Closes #1389 See merge request redox-os/redox!1409
This commit is contained in:
		
						commit
						5831c26aef
					
				
					 2 changed files with 4 additions and 6 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							|  | @ -10,6 +10,7 @@ | |||
| 	path = rust | ||||
| 	url = https://gitlab.redox-os.org/redox-os/rust.git | ||||
| 	branch = redox-2023-09-07 | ||||
| 	update = none | ||||
| [submodule "redoxfs"] | ||||
| 	path = redoxfs | ||||
| 	url = https://gitlab.redox-os.org/redox-os/redoxfs.git | ||||
|  |  | |||
|  | @ -37,12 +37,6 @@ else | |||
| 	rm -rf "$@.partial/$(TARGET)/include/"* | ||||
| 	cp -r "$(PREFIX)/rust-install/$(TARGET)/include/c++" "$@.partial/$(TARGET)/include/c++" | ||||
| 	cp -r "$(PREFIX)/rust-install/lib/rustlib/$(HOST_TARGET)/lib/" "$@.partial/lib/rustlib/$(HOST_TARGET)/" | ||||
| # Temporary hack to avoid breaking stuff before new pre-build prefix tarball with fixed rustlib/src is build and served at https://static.redox-os.org/toolchain/$(TARGET)/relibc-install.tar.gz 
 | ||||
| ifeq ($(PREFIX_BINARY),1) | ||||
| 	rm -rf $@.partial/lib/rustlib/src | ||||
| 	mkdir $@.partial/lib/rustlib/src | ||||
| 	ln -s $(ROOT)/rust $@.partial/lib/rustlib/src | ||||
| endif | ||||
| 	cd "$<" && \
 | ||||
| 	export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
 | ||||
| 	export CARGO="env -u CARGO cargo" && \
 | ||||
|  | @ -79,6 +73,9 @@ $(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz | |||
| 
 | ||||
| else | ||||
| 
 | ||||
| $(ROOT)/rust: | ||||
| 	git submodule update --init --recursive --checkout rust | ||||
| 
 | ||||
| PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install | ||||
| PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Jeremy Soller
						Jeremy Soller