summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-18 16:59:54 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-18 16:59:54 +0000
commitd741bcafe7ebf16f00fa94f203d3ed743eddf686 (patch)
treec478b5daa62312adaecac46bdaa1d5492ba84291
parent5454c3ec16546518e09b34e8ec6e9572202b9950 (diff)
downloadeglibc2-d741bcafe7ebf16f00fa94f203d3ed743eddf686.tar.gz
Really fix 'morph-arch-config' invocation
-rw-r--r--eglibc.morph2
-rw-r--r--eglibc.morph.yaml2
-rw-r--r--stage2-eglibc.morph2
-rw-r--r--stage2-eglibc.morph.yaml2
4 files changed, 4 insertions, 4 deletions
diff --git a/eglibc.morph b/eglibc.morph
index 771960012..f656e0c62 100644
--- a/eglibc.morph
+++ b/eglibc.morph
@@ -4,7 +4,7 @@
"configure-commands": [
"mkdir o",
"cd libc && ln -s ../ports ports",
- "export CFLAGS=\"-O2 $CFLAGS\"; cd o &&\n../libc/configure \\\n $(./morph-arch-config) \\\n --prefix=\"$PREFIX\" \\\n --disable-profile \\\n --enable-kernel=2.6.25 \\\n --enable-add-ons=nptl,ports \\\n --without-cvs \\\n --without-selinux\n"
+ "export CFLAGS=\"-O2 $CFLAGS\"; cd o &&\n../libc/configure \\\n $(../morph-arch-config) \\\n --prefix=\"$PREFIX\" \\\n --disable-profile \\\n --enable-kernel=2.6.25 \\\n --enable-add-ons=nptl,ports \\\n --without-cvs \\\n --without-selinux\n"
],
"build-commands": [
"cd o && make localtime=UTC"
diff --git a/eglibc.morph.yaml b/eglibc.morph.yaml
index 11070af67..46fe99910 100644
--- a/eglibc.morph.yaml
+++ b/eglibc.morph.yaml
@@ -10,7 +10,7 @@ configure-commands:
- |
export CFLAGS="-O2 $CFLAGS"; cd o &&
../libc/configure \
- $(./morph-arch-config) \
+ $(../morph-arch-config) \
--prefix="$PREFIX" \
--disable-profile \
--enable-kernel=2.6.25 \
diff --git a/stage2-eglibc.morph b/stage2-eglibc.morph
index d7d4c2444..48cb8a100 100644
--- a/stage2-eglibc.morph
+++ b/stage2-eglibc.morph
@@ -4,7 +4,7 @@
"configure-commands": [
"mkdir o",
"cd libc && ln -s ../ports ports",
- "export CFLAGS=\"-O2 $CFLAGS\"; export CXX=false; \\\ncd o && ../libc/configure \\\n $(./morph-arch-config) \\\n --build=$(../libc/scripts/config.guess) --host=$TARGET_STAGE1 \\\n --prefix=\"$PREFIX\" \\\n `# [1]` --libdir=\"$PREFIX/lib\" \\\n `# [2]` --with-headers=\"$(pwd)/../../$PREFIX/include\" \\\n `# [3]` --disable-profile --enable-kernel=2.6.25 \\\n --enable-add-ons=nptl,ports --without-cvs --without-selinux \\\n `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \\\n libc_cv_forced_unwind=yes libc_cv_ssp=no\n"
+ "export CFLAGS=\"-O2 $CFLAGS\"; export CXX=false; \\\ncd o && ../libc/configure \\\n $(../morph-arch-config) \\\n --build=$(../libc/scripts/config.guess) --host=$TARGET_STAGE1 \\\n --prefix=\"$PREFIX\" \\\n `# [1]` --libdir=\"$PREFIX/lib\" \\\n `# [2]` --with-headers=\"$(pwd)/../../$PREFIX/include\" \\\n `# [3]` --disable-profile --enable-kernel=2.6.25 \\\n --enable-add-ons=nptl,ports --without-cvs --without-selinux \\\n `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \\\n libc_cv_forced_unwind=yes libc_cv_ssp=no\n"
],
"build-commands": [
"cd o && make localtime=UTC"
diff --git a/stage2-eglibc.morph.yaml b/stage2-eglibc.morph.yaml
index ed97e7c57..85b448533 100644
--- a/stage2-eglibc.morph.yaml
+++ b/stage2-eglibc.morph.yaml
@@ -16,7 +16,7 @@ configure-commands:
- |
export CFLAGS="-O2 $CFLAGS"; export CXX=false; \
cd o && ../libc/configure \
- $(./morph-arch-config) \
+ $(../morph-arch-config) \
--build=$(../libc/scripts/config.guess) --host=$TARGET_STAGE1 \
--prefix="$PREFIX" \
`# [1]` --libdir="$PREFIX/lib" \