mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-11 06:10:06 +02:00
67 lines
1.8 KiB
Plaintext
67 lines
1.8 KiB
Plaintext
From 66c2723241be57cf1cee492029da4d25aa9e6872 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@gmail.com>
|
|
Date: Sun, 18 Jan 2015 15:35:30 +0100
|
|
Subject: Adjust setvars.sh to Haiku build environment.
|
|
|
|
|
|
diff --git a/setvars.sh b/setvars.sh
|
|
index a64d135..30bce44 100755
|
|
--- a/setvars.sh
|
|
+++ b/setvars.sh
|
|
@@ -6,14 +6,14 @@
|
|
# modify it as necessary for your own use!!
|
|
|
|
# Change this to point your Open Watcom source tree
|
|
-export OWROOT=/home/ow/ow
|
|
+export OWROOT=/sources/openwatcom-2.0.0
|
|
|
|
# Subdirectory to be used for building OW build tools
|
|
export OWOBJDIR=binbuild
|
|
|
|
# Set this entry to identify your toolchain used by build process
|
|
# supported values are WATCOM GCC CLANG
|
|
-export OWTOOLS=WATCOM
|
|
+export OWTOOLS=GCC
|
|
|
|
# Documentation related variables
|
|
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From 660e017bc12f8295dd17c7a324530a48669b37af Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@gmail.com>
|
|
Date: Mon, 19 Jan 2015 22:44:26 +0100
|
|
Subject: Fix local.mif for Haiku.
|
|
|
|
* It was still referencing BSD from which it was copied, resulting in
|
|
broken build.
|
|
|
|
diff --git a/build/mif/local.mif b/build/mif/local.mif
|
|
index f9cef19..f55d161 100644
|
|
--- a/build/mif/local.mif
|
|
+++ b/build/mif/local.mif
|
|
@@ -296,7 +296,7 @@ bld_cl_sys =
|
|
|
|
bld_incs = $(bld_extra_incs) -I"$(watcom_dir)/h"
|
|
|
|
-bld_cppflags = $(common_cppflags_bsd) $(common_cppflags_$(bld_cpu))
|
|
+bld_cppflags = $(common_cppflags_haiku) $(common_cppflags_$(bld_cpu))
|
|
|
|
bld_cflags = $(common_cflags) $(common_flags) -o $@
|
|
|
|
@@ -328,8 +328,8 @@ cl = clang -pipe
|
|
|
|
librarian = ar
|
|
|
|
-cppflags_bsd = $(common_cppflags_bsd)
|
|
-cppflags_osi = $(common_cppflags_bsd)
|
|
+cppflags_haiku = $(common_cppflags_haiku)
|
|
+cppflags_osi = $(common_cppflags_haiku)
|
|
cppflags_386 = $(common_cppflags_386)
|
|
cppflags_ppc = $(common_cppflags_ppc)
|
|
cppflags_x64 = $(common_cppflags_x64)
|
|
--
|
|
2.2.2
|
|
|