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.

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

[build] Fix make clean and add comments to wcenv.sh #2160

Merged
merged 1 commit into from
Dec 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,17 @@ kclean:

clean:
$(MAKE) -C libc clean
$(MAKE) -C libc -f watcom.mk clean
$(MAKE) -C libc -f c86.mk
$(MAKE) -C libc DESTDIR='$(TOPDIR)/cross' uninstall
$(MAKE) -C elks clean
$(MAKE) -C bootblocks clean
$(MAKE) -C elkscmd clean
$(MAKE) -C image clean
ifneq "$(WATCOM)" ""
$(MAKE) -C libc -f watcom.mk clean
endif
ifneq "$(C86)" ""
$(MAKE) -C libc -f c86.mk clean
endif
ifeq ($(shell uname), Linux)
$(MAKE) -C elksemu clean
endif
Expand Down
7 changes: 5 additions & 2 deletions libc/wcenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
# Set up Watcom build environment
#
# Usage: . ./wcenv.sh
#
# NOTE: The export= and add_path lines below need to be edited for your system.

# change to OpenWatcom installation root it is full path to OpenWatcom location
# if you use your own OpenWatcom build than it is located in rel subdirectory
# Change below to OpenWatcom installation root: the full path to OpenWatcom location.
# If you use your own OpenWatcom build than it is located in rel subdirectory.
export WATCOM=/Users/greg/net/open-watcom-v2/rel

add_path () {
Expand All @@ -14,6 +16,7 @@ add_path () {
fi
}

# Change below according to whether your host system is Linux or macOS
#add_path "$WATCOM/binl" # for Linux-32
#add_path "$WATCOM/binl64" # for Linux-64
add_path "$WATCOM/bino64" # for macOS
Expand Down
Loading