Commit 3db83998 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain: revert "Allow creating a script for external use of Buildroot toolchain" 

It's been 10 days now without any reply from Ulf, so revert r24480+r24481.
parent 31de8c37

toolchain/Config.in

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ config BR2_TOOLCHAIN_SOURCE 
	default y if BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_SOURCE

	default n if BR2_TOOLCHAIN_EXTERNAL



source "toolchain/export-toolchain/Config.in"



source "target/device/Config.in.toolchain"



source "toolchain/Config.in.1"

toolchain/Makefile.in

+0 −2
Original line number Diff line number Diff line
@@ -46,5 +46,3 @@ CFLAGS_COMBINE = $(call cc-option,-combine,) 


# gcc has a bunch of needed stuff....

include toolchain/gcc/Makefile.in
 
# breaks the build

#include toolchain/export-toolchain/Makefile.in

toolchain/export-toolchain/Config.in

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
config BR2_EXPORT_TOOLCHAIN

	bool "Create script exporting toolchain to home directory"

	default n

	help

	  This will generate a batchfile which, if run

	  will add the Buildroot toolchain to the user PATH

	  The file is called "$(ARCH)-uclibc-gcc-$(GCC_VERSION).sh"

toolchain/export-toolchain/Makefile.in

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
# This generates a script which exports the toolchain

# using a shell script



GCC_SCRIPT:=$(ARCH)-uclibc-gcc-$(GCC_VERSION).sh

GCC_SCRIPT_TEMP:=$(BINARIES_DIR)/$(GCC_SCRIPT)



~/$(GCC_SCRIPT): cross_compiler

	@echo	"#!/bin/sh"						>	$(GCC_SCRIPT_TEMP)

	@echo	"# $(ARCH) cross compiler toolchain created $(DATE)"	>>	$(GCC_SCRIPT_TEMP)

	@echo	"# gcc-$(GCC_VERSION)"					>>	$(GCC_SCRIPT_TEMP)

	@echo	"# binutils-$(BINUTILS_VERSION)"			>>	$(GCC_SCRIPT_TEMP)

	@echo	"# uClibc-$(UCLIBC_VERSION)"				>>	$(GCC_SCRIPT_TEMP)

	@echo	"export	GCCROOT=$(STAGING_DIR)/usr"			>>	$(GCC_SCRIPT_TEMP)

	@echo	"export	PATH=\$$PATH:\$$GCCROOT/bin"			>>	$(GCC_SCRIPT_TEMP)

	@echo	"export	CROSS_COMPILE=$(REAL_GNU_TARGET_NAME)-"		>>	$(GCC_SCRIPT_TEMP)

	@chmod	a+x $(GCC_SCRIPT_TEMP)

	@cp	$(GCC_SCRIPT_TEMP) ~/$(GCC_SCRIPT)

	@cat	~/$(GCC_SCRIPT)



export-toolchain: ~/$(GCC_SCRIPT)



export-toolchain-clean:

	rm	-f ~/$(GCC_SCRIPT)

	rm	-f $(GCC_SCRIPT_TEMP)



ifeq ($(BR2_EXPORT_TOOLCHAIN),y)

TARGETS+=export-toolchain

endif

toolchain/uClibc/Config.in

+0 −6
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ choice 


endchoice



config UCLIBC_VERSION

	string

	default "0.9.28.3"	if BR2_UCLIBC_VERSION_0_9_28_3

	default "0.9.29"	if BR2_UCLIBC_VERSION_0_9_29

	default "0.9.30"	if BR2_UCLIBC_VERSION_0_9_30

	default "snapshot"	if BR2_UCLIBC_VERSION_SNAPSHOT



config BR2_USE_UCLIBC_SNAPSHOT

	string "Date (yyyymmdd) of snapshot or 'snapshot' for latest"