Skip to content

Commit

Permalink
fixes to get it to actually work
Browse files Browse the repository at this point in the history
  • Loading branch information
williamstein committed Nov 30, 2022
1 parent 683a68f commit ec46c7a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 109 deletions.
49 changes: 0 additions & 49 deletions Makefile-rules

This file was deleted.

56 changes: 0 additions & 56 deletions Makefile-vars

This file was deleted.

10 changes: 10 additions & 0 deletions Makefile-vars-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This is a bootstrap version of Makefile-vars, just for installing some binaries.

CWD:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
PACKAGES = ${CWD}/../../..
UPSTREAM = ${PACKAGES}/../upstream/sources
BIN = ${PACKAGES}/../bin
BUILD = ${CWD}/build
BUILD_NATIVE = ${BUILD}/native
DIST = ${CWD}/dist
DIST_NATIVE = ${DIST}/native
4 changes: 2 additions & 2 deletions node/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# for your architecture here, so that we can use it for
# building everything else.

include ../build/Makefile-vars
include ../Makefile-vars-build

# Find the latest version at https://nodejs.org/dist/latest/
VERSION = 19.1.0
Expand All @@ -20,7 +20,7 @@ OS = $(shell uname -s | sed s/Darwin/darwin/ | sed s/Linux/linux/)
TARBALL = ${UPSTREAM}/node-v${VERSION}-${OS}-${ARCH}.tar.xz
URL = https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-${OS}-${ARCH}.tar.xz

include ../build/Makefile-rules
include ../../Makefile-rules

${DIST_NATIVE}/.${VERSION}: ${TARBALL}
rm -rf ${DIST_NATIVE}
Expand Down
4 changes: 2 additions & 2 deletions zig/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# for your architecture here, so that we can use it for
# building everything else.

include ../build/Makefile-vars
include ../Makefile-vars-build

# Find the latest version at https://ziglang.org/download/

Expand Down Expand Up @@ -41,7 +41,7 @@ TARBALL = ${UPSTREAM}/zig-${OS}-${ARCH}-${VERSION}.tar.xz

all: ${DIST_NATIVE}/.${VERSION} ${BIN}/cowasm-cc ${BIN}/cowasm-c++ ${BIN}/cowasm-zig ${BIN}/zig

include ../build/Makefile-rules
include ../../Makefile-rules

${DIST_NATIVE}/.${VERSION}: ${TARBALL}
rm -rf ${DIST_NATIVE}
Expand Down

0 comments on commit ec46c7a

Please sign in to comment.