summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-01-14 09:02:29 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-01-14 09:04:21 (GMT)
commit1300cb55621d1565a1b09e907963d77f272eacb4 (patch)
tree8ea6e1b3331f976096abafb19cec88ee83e27294
parent0bc0da0bb41dc3ae77913e6321bb0326f039a413 (diff)
downloadbuildroot-1300cb55621d1565a1b09e907963d77f272eacb4.tar.gz
buildroot-1300cb55621d1565a1b09e907963d77f272eacb4.tar.bz2
Makefile: don't export O to the environment
Several projects use the kernel style O=<dir> syntax to build out of tree, and atleast uClibc doesn't check that it was explictly passed on the command line, so setting it in the environment breaks the build. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--Makefile2
-rw-r--r--docs/manual/customize-rootfs.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 16b5ef4..f408632 100644
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,7 @@ export TARGET_DIR
export STAGING_DIR
export HOST_DIR
export BINARIES_DIR
-export BASE_DIR O # O and BASE_DIR are the same
+export BASE_DIR
#############################################################
#
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 4d3b559..6399699 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -43,7 +43,7 @@ there are a few ways to customize the resulting target filesystem.
xref:generic-package-reference[]
- +BINARIES_DIR+: the place where all binary files (aka images) are
stored
- - +BASE_DIR+ (or +O+): the base output directory
+ - +BASE_DIR+: the base output directory
* A special package, 'customize', stored in +package/customize+ can be
used. You can put all the files that you want to see in the final