Skip to content

Commit 97d1545

Browse files
committed
externals: eliminate unused glibcbase build parameter
References #743 Signed-off-by: Waldemar Kozaczuk <jwkozaczuk@gmail.com>
1 parent 091fdae commit 97d1545

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ local-includes =
231231
INCLUDES = $(local-includes) -Iarch/$(arch) -I. -Iinclude -Iarch/common
232232
INCLUDES += -isystem include/glibc-compat
233233

234-
glibcbase = external/$(arch)/glibc.bin
235234
gccbase = external/$(arch)/gcc.bin
236235
miscbase = external/$(arch)/misc.bin
237236
jdkbase := $(shell find external/$(arch)/openjdk.bin/usr/lib/jvm \
@@ -1941,8 +1940,8 @@ $(bootfs_manifest_dep): phony
19411940
$(out)/bootfs.bin: scripts/mkbootfs.py $(bootfs_manifest) $(bootfs_manifest_dep) $(tools:%=$(out)/%) \
19421941
$(out)/zpool.so $(out)/zfs.so $(out)/libenviron.so $(out)/libvdso.so
19431942
$(call quiet, olddir=`pwd`; cd $(out); "$$olddir"/scripts/mkbootfs.py -o bootfs.bin -d bootfs.bin.d -m "$$olddir"/$(bootfs_manifest) \
1944-
-D jdkbase="$$olddir"/$(jdkbase) -D gccbase="$$olddir"/$(gccbase) -D \
1945-
glibcbase="$$olddir"/$(glibcbase) -D miscbase="$$olddir"/$(miscbase), MKBOOTFS $@)
1943+
-D jdkbase="$$olddir"/$(jdkbase) -D gccbase="$$olddir"/$(gccbase) \
1944+
-D miscbase="$$olddir"/$(miscbase), MKBOOTFS $@)
19461945

19471946
$(out)/bootfs.o: $(out)/bootfs.bin
19481947
$(out)/bootfs.o: ASFLAGS += -I$(out)

scripts/build

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ modules=${vars[modules]-!$image}
172172
# TODO: some modules need these... Would be better if they wouldn't...
173173
jdkbase=${vars[jdkbase]-`find "$SRC"/external/$arch/openjdk.bin/usr/lib/jvm -maxdepth 1 -type d -name 'java*'`}
174174
gccbase=${vars[gccbase]-"$SRC"/external/$arch/gcc.bin}
175-
glibcbase=${vars[glibcbase]-"$SRC"/external/$arch/glibc.bin}
176175
miscbase=${vars[miscbase]-"$SRC"/external/$arch/misc.bin}
177176

178177
case $OUT in
@@ -270,15 +269,15 @@ zfs)
270269

271270
if [ "$export" == "none" ]
272271
then
273-
"$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D glibcbase="$glibcbase" -D miscbase="$miscbase"
272+
"$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase"
274273
else
275274
export_dir=${vars[export_dir]-$SRC/build/export}
276-
"$SRC"/scripts/export_manifest.py -e "$export_dir" -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D glibcbase="$glibcbase" -D miscbase="$miscbase"
275+
"$SRC"/scripts/export_manifest.py -e "$export_dir" -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase"
277276
fi
278277
;;
279278
rofs)
280279
rm -rf rofs.img
281-
"$SRC"/scripts/gen-rofs-img.py -o rofs.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D glibcbase="$glibcbase" -D miscbase="$miscbase"
280+
"$SRC"/scripts/gen-rofs-img.py -o rofs.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase"
282281
rofs_size=`stat --printf %s rofs.img`
283282
img_size=$((kernel_end + rofs_size))
284283
cp loader.img bare.raw

0 commit comments

Comments
 (0)