Changeset 68 for trunk/Makefile

Timestamp:

Apr 29, 2003, 10:19:49 PM (23 years ago)

Author:

bird

Message:

Adjusting configure. sanity.

File:

• trunk/Makefile (modified) (3 diffs, 1 prop)

trunk/Makefile

@@ -114 +114 @@
         
 all-sanity:
-        if [ "$(UNIXROOT)x" = "x" ]; then \
-                echo "Error: UNIXROOT isn't defined!"; \
+        @echo -n "Checking build environment sanity... "
+        @if [ "x$(UNIXROOT)" = "x" ]; then \
+                echo ""; echo "Error: UNIXROOT isn't defined!"; \
                 exit 8; \
         fi
+        @if [ "x$(BUILD_PROJECT)" != "xGCCOS2" ]; then \
+                echo ""; echo "Error: BUILD_PROJECT is wrong or isn't defined!"; \
+                exit 8; \
+        fi
+        @if [ "x$(BUILD_PLATFORM)" != "xOS2" ]; then \
+                echo ""; echo "Error: BUILD_PLATFORM is wrong or isn't defined!"; \
+                exit 8; \
+        fi
+        @echo "ok"
+        
 
 PRELOADED_TOOLS = bin/sh.exe bin/echo.exe bin/true.exe usr/bin/test.exe usr/bin/expr.exe \
@@ -219 +230 @@
                 export LDFLAGS=\"-s -Zexe -Zcrtdll\" ; \
                 $< \
+                --enable-clh \
                 --enable-threads=os2 \
-                --enable-shared \
+                --enable-shared=libgcc \
                 --enable-nls \
                 --without-included-gettext \
@@ -253 +265 @@
 
 $(PATH_OBJ)/gcc/gcc/Makefile: $(PATH_TOP)/src/gcc/gcc/configure
-        $(BASH) -c "export LDFLAGS=\"-s -Zexe -Zcrtdll\" ; $< --enable-threads --enable-shared --enable-nls --without-included-gettext --prefix=$(PATH_BIN)/usr/bin/local/gcc322 "
+        $(BASH) -c "export LDFLAGS=\"-s -Zexe -Zcrtdll\" ; $< --enable-clh --enable-threads --enable-shared --enable-nls --without-included-gettext --prefix=$(PATH_BIN)/usr/bin/local/gcc322 "
 #       $(BASH) -c "export LDFLAGS=\"-s -Zexe -Zcrtdll\" ; $< --enable-threads --enable-shared --enable-nls --without-included-gettext --prefix=$(PATH_BIN)/usr/bin/local/gcc322 --disable-multilib --disable-shared  "
 #       $(BASH) -c "export LDFLAGS=\"-s -Zexe -Zcrtdll\" ; $< --enable-clh --enable-threads --enable-shared --enable-nls --without-included-gettext --prefix=/dev/gcc/v3.2.2"