1 |
Index: 0ad-0.0.25b-alpha/libraries/source/spidermonkey/build.sh |
2 |
=================================================================== |
3 |
--- 0ad-0.0.25b-alpha/libraries/source/spidermonkey/build.sh |
4 |
+++ 0ad-0.0.25b-alpha/libraries/source/spidermonkey/build.sh 2022-03-14 12:06:35.481780817 +0100 |
5 |
@@ -113,23 +113,6 @@ |
6 |
cd "$FOLDER" |
7 |
fi |
8 |
|
9 |
-# Debug version of SM is broken on FreeBSD. |
10 |
-if [ "$(uname -s)" != "FreeBSD" ]; then |
11 |
- mkdir -p build-debug |
12 |
- cd build-debug |
13 |
- # SM configure checks for autoconf, but we don't actually need it. |
14 |
- # To avoid a dependency, pass something arbitrary (it does need to be an actual program). |
15 |
- # llvm-objdump is searched for with the complete name, not simply 'objdump', account for that. |
16 |
- CXXFLAGS="${CXXFLAGS}" ../js/src/configure AUTOCONF="ls" \ |
17 |
- LLVM_OBJDUMP="${LLVM_OBJDUMP}" \ |
18 |
- ${CONF_OPTS} \ |
19 |
- --enable-debug \ |
20 |
- --disable-optimize \ |
21 |
- --enable-gczeal |
22 |
- ${MAKE} ${MAKE_OPTS} |
23 |
- cd .. |
24 |
-fi |
25 |
- |
26 |
mkdir -p build-release |
27 |
cd build-release |
28 |
CXXFLAGS="${CXXFLAGS}" ../js/src/configure AUTOCONF="ls" \ |
29 |
@@ -182,11 +165,6 @@ |
30 |
mkdir -p "${INCLUDE_DIR_RELEASE}" |
31 |
cp -R -L "${FOLDER}"/build-release/dist/include/* "${INCLUDE_DIR_RELEASE}/" |
32 |
|
33 |
-if [ "$(uname -s)" != "FreeBSD" ]; then |
34 |
- mkdir -p "${INCLUDE_DIR_DEBUG}" |
35 |
- cp -R -L "${FOLDER}"/build-debug/dist/include/* "${INCLUDE_DIR_DEBUG}/" |
36 |
-fi |
37 |
- |
38 |
# These align the ligns below, making it easier to check for mistakes. |
39 |
DEB="debug" |
40 |
REL="release" |
41 |
@@ -223,10 +201,6 @@ |
42 |
# Copy shared libs to both lib/ and binaries/ so the compiler and executable (resp.) can find them. |
43 |
cp -L "${FOLDER}/build-${REL}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" |
44 |
cp -L "${FOLDER}/build-${REL}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" |
45 |
- if [ "$(uname -s)" != "FreeBSD" ]; then |
46 |
- cp -L "${FOLDER}/build-${DEB}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" |
47 |
- cp -L "${FOLDER}/build-${DEB}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" |
48 |
- fi |
49 |
fi |
50 |
|
51 |
# Flag that it's already been built successfully so we can skip it next time |