Skip to content

Commit

Permalink
Merge pull request #2160 from ghaerr/fixup
Browse files Browse the repository at this point in the history
[build] Fix make clean and add comments to wcenv.sh
  • Loading branch information
ghaerr authored Dec 29, 2024
2 parents c129102 + 0194fce commit 7748baa
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
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

0 comments on commit 7748baa

Please sign in to comment.