Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(www): don't try to build tun2socks when developing for the browser #1833

Merged
merged 2 commits into from
Feb 5, 2024
Merged

fix(www): don't try to build tun2socks when developing for the browser #1833

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9497404
fix(www): don't try to build tun2socks when developing for the browser
daniellacosse Feb 5, 2024
55402b0
do it in the javascript
daniellacosse Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GOBIND=env PATH="$(GOBIN):$(PATH)" "$(GOMOBILE)" bind
IMPORT_HOST=github.com
IMPORT_PATH=$(IMPORT_HOST)/Jigsaw-Code/outline-client

.PHONY: android apple linux windows
.PHONY: android apple linux windows browser

all: android apple linux windows

Expand Down Expand Up @@ -35,6 +35,9 @@ $(BUILDDIR)/apple/Tun2socks.xcframework: $(BUILDDIR)/ios/Tun2socks.xcframework $
find $^ -name "Tun2socks.framework" -type d | xargs -I {} echo " -framework {} " | \
xargs xcrun xcodebuild -create-xcframework -output "$@"

browser:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's skip in https://github.com/Jigsaw-Code/outline-client/blob/master/src/tun2socks/build.action.mjs instead, so it doesn't even reach the make step and the per-platform dispatching is centralized in one place.

echo "Browser target not needed for tun2socks"

XGO=$(GOBIN)/xgo
TUN2SOCKS_VERSION=v1.16.11
XGO_LDFLAGS='-w -X main.version=$(TUN2SOCKS_VERSION)'
Expand Down
Loading